x/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-08-02 02:36:10 +00:00
Code Issues Packages Projects Releases Wiki Activity
31,074 Commits 40 Branches 429 Tags
db93a5a0c8eb349c4380be61874c477fbcd248a3
Commit Graph
14447 Commits
Author SHA1 Message Date
Michael Niedermayer db93a5a0c8 cabac: fix cabac encoder 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 89653ea728)
 2011-09-21 18:00:18 +02:00
Laurent AimarandMichael Niedermayer b5fe6bee01 Fixed deference of NULL pointer in motionpixels decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 824f98f442)
 2011-09-21 18:00:10 +02:00
Laurent AimarandMichael Niedermayer 7181adab80 Fixed size given to init_get_bits(). 
init_get_bits() takes a number of bits and not a number of bytes as
its size argument.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit e5e0580b93)
 2011-09-21 17:59:48 +02:00
Laurent AimarandMichael Niedermayer bac822025e Fixed size given to init_get_bits() in ffv1 decoder. 
init_get_bits() takes a number of bits and not a number of bytes as
its size argument.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 8362a0ffed)
 2011-09-21 17:59:43 +02:00
Alex ConverseandMichael Niedermayer 8a8aafd2b9 wavpack: Check error codes rather than working around error conditions. 
(cherry picked from commit dba2b63a98)
 2011-09-21 17:59:36 +02:00
Michael Niedermayer a13ef61051 rc: finetune convergence failure fix 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 73e0ec2ff4)
 2011-09-21 17:59:30 +02:00
Michael Niedermayer 4fbc35cd53 rc: fix convergence failure 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit ed14517c23)
 2011-09-21 17:59:25 +02:00
Laurent AimarandMichael Niedermayer 558cf502ac Fixed invalid writes in wavpack decoder on corrupted bitstreams. 
Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit 0aedab0340)
 2011-09-21 17:57:33 +02:00
Chris RankinandMichael Niedermayer b0da6a744a qcelpdec: fix the return value of qcelp_decode_frame(). 
(cherry picked from commit 04c13dca88)
 2011-09-21 17:57:01 +02:00
Michael Niedermayer d99613bad6 jpeglsdec: fix infinite loop 
Fixes Ticket331

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit bd358e128f)
 2011-09-21 17:57:01 +02:00
Kostya ShishkovandMichael Niedermayer c026f336b9 wavpack: fix wrong return value in wavpack_decode_block() 
This function should return number of samples decoded, not number of bytes
decoded.
Spotted by Uoti Urpala.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
(cherry picked from commit bcd4aa8bec)
 2011-09-21 17:56:15 +02:00
Reimar DöffingerandMichael Niedermayer 5c2d684986 Check extradata size on resolution change. 
Ignore resolution change if resolution not defined in extradata.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
(cherry picked from commit 09c5f990bc)
 2011-09-21 17:56:15 +02:00
Gavin KinseyandMichael Niedermayer 30442fa217 jpegdec: set color_range 
(cherry picked from commit 2f870e262e)
 2011-09-21 17:56:15 +02:00
Michael Niedermayer e7d10f5a90 mpeg4: fix typo in mpeg4_encode_gop_header() 
Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit f5bda9fcbb)
 2011-09-21 17:56:15 +02:00
Michael Niedermayer ca5dfd1550 h264: clean all non null elements of delayed_pic[] 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 66ce282df5)
 2011-09-21 17:56:14 +02:00
Michael Niedermayer 1979a9b4f2 h264: change MAX_DELAYED_PIC_COUNT check to av_assert0 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit b955ab2f49)
 2011-09-21 17:56:14 +02:00
Edgar HucekandCarl Eugen Hoyos 3af3a871af Fix VA-API decoding artefacts. 
Fixes ticket #457.
(cherry picked from commit 3fec40b601)
 2011-09-11 12:56:54 +02:00
Alex ConverseandMichael Niedermayer 48ba48fb13 wavpack: Check error codes rather than working around error conditions. 
(cherry picked from commit dba2b63a98)
 2011-09-10 05:38:02 +02:00
Laurent AimarandMichael Niedermayer e1baba3ddb Fixed invalid access in wavpack decoder on corrupted bitstream. 
Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit 55354b7de2)
 2011-09-08 23:48:42 +02:00
Laurent AimarandMichael Niedermayer 399f7e0e75 Fixed invalid writes in wavpack decoder on corrupted bitstreams. 
Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit 0aedab0340)
 2011-09-08 23:48:42 +02:00
Laurent AimarandMichael Niedermayer 90edd5df3d Fixed invalid access in wavpack decoder on corrupted extra bits sub-blocks. 
Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit beefafda63)
 2011-09-08 23:48:42 +02:00
Chris RankinandMichael Niedermayer b2c9e9be87 mp3dec: Dont spam the user on multiple mp3 frames. 
(cherry picked from commit 54e1eaef67)
 2011-09-08 21:14:10 +02:00
Michael Niedermayer b6187e48db cavsdec: avoid possible crash with crafted input 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 9f06c1c61e)
 2011-09-07 14:59:29 +02:00
Michael NiedermayerandCarl Eugen Hoyos eb975b1c8b mjpegdec; even better RSTn skiping 
Fixes Ticket426

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit be7eed72c8)
 2011-09-07 00:31:14 +02:00
Michael NiedermayerandCarl Eugen Hoyos 84648d33ba jpegdec: better rst skiping 
Fixes Ticket426

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 94c2478d90)
 2011-09-07 00:31:14 +02:00
Michael NiedermayerandCarl Eugen Hoyos 4b8a0b058d mpeg4: fix another packed divx issue. 
Fixes getting_stuck.avi

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 6dbac85f8d)
 2011-09-07 00:29:02 +02:00
Michael NiedermayerandCarl Eugen Hoyos 1de90fd375 mpeg4: adjust dummy frame threashold for packed divx. 
Fixes Ticket427

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 3e7e1f1509)
 2011-09-07 00:29:02 +02:00
Michael Niedermayer 878a7d1573 Merge remote-tracking branch 'qatar/release/0.7' into release/0.8 
* qatar/release/0.7:
  cavs: fix some crashes with invalid bitstreams
  jpegdec: actually search for and parse RSTn

Conflicts:
	libavcodec/mjpegdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-21 22:44:58 +02:00
Mans RullgardandReinhard Tartler bd968d260a cavs: fix some crashes with invalid bitstreams 
This removes all valgrind-reported invalid writes with one
specific test file.

Fixes http://www.ocert.org/advisories/ocert-2011-002.html

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 4a71da0f3a)
 2011-08-21 11:23:56 +02:00
Michael NiedermayerandReinhard Tartler 00c5cf4beb jpegdec: actually search for and parse RSTn 
Fixes decoding of MJPEG files produced by some UVC Logitec web cameras,
such as "Notebook Pro" and "HD C910".

References:
http://trac.videolan.org/vlc/ticket/4215
http://ffmpeg.org/trac/ffmpeg/ticket/267

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Reviewed-by: Kostya <kostya.shishkov@gmail.com>
(cherry picked from commit 8c0fa61a97)
 2011-08-21 11:08:27 +02:00
Michael Niedermayer 91d5da9321 cavs: fix oCERT #2011-002 FFmpeg/libavcodec insufficient boundary check 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-10 13:46:22 +02:00
Reimar DöffingerandCarl Eugen Hoyos a0352d01e9 Bink: clip AC coefficients during dequantization. 
Fixes artefacts with Neverwinter Nights WOTCLogo.bik
(http://drmccoy.de/zeugs/WOTCLogo.bik).
Fixes trac ticket #352.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
(cherry picked from commit 47b71eea09)
 2011-08-04 11:45:28 +02:00
Michael Niedermayer 095946afa7 Merge remote-tracking branch 'qatar/release/0.7' into release/0.8 
* qatar/release/0.7: (65 commits)
  riff: Add mpgv MPEG-2 fourcc
  Update Changelog
  matroskadec: fix integer underflow if header length < probe length.
  ffmpeg: fix operation with --disable-avfilter
  vf_libopencv: replace opencv/cxtypes.h #include by opencv/cxcore.h
  build: Create mlib optimization directories during out-of-tree builds.
  changelog: misc typo and wording fixes (cherry picked from commit b047941d7d)
  doc: Remove outdated comments about gcc 2.95 and gcc 3.3 support. (cherry picked from commit 5ccbf80963)
  matroskadec: matroska_read_seek after after EBML_STOP leads to failure.
  Update RELEASE file
  update Changelog
  mt: proper locking around release_buffer calls.
  vp8/mt: flush worker thread, not application thread context, on seek.
  docs: Mention the upstream bugzilla url about the dlltool vs MSVC issue
  docs: Use proper markup for a literal command line option
  docs: Don't recommend adding --enable-memalign-hack
  docs: Remove needless configure options
  oggdec: prevent heap corruption.
  oggdec: Abort Ogg header parsing when encountering a data packet.
  Add LGPL license boilerplate to files lacking it.
  ...

Conflicts:
	Changelog
	configure
	doc/developer.texi
	libavcodec/libvpxenc.c
	libavcodec/rawdec.c
	libavfilter/x86/gradfun.c
	libavformat/Makefile
	libavformat/isom.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-07-26 00:14:04 +02:00
Ronald S. BultjeandReinhard Tartler 5e3578893a mt: proper locking around release_buffer calls. 
This fixes a crash when seeking in some webm files with many
threads (e.g. 8).
(cherry picked from commit 5eafc8b466)
 2011-07-12 18:13:35 +02:00
Ronald S. BultjeandReinhard Tartler dc1b670a2c vp8/mt: flush worker thread, not application thread context, on seek. 
This prevents a crash when seeking.
(cherry picked from commit d1cf459119)
 2011-07-12 18:13:35 +02:00
Diego BiurrunandReinhard Tartler 683df9bf54 Add LGPL license boilerplate to files lacking it. 
(cherry picked from commit e3759c567d)
 2011-07-12 18:13:35 +02:00
Diego BiurrunandReinhard Tartler 64e2656f7c doxygen: Fix documentation for some VP8 functions. 
(cherry picked from commit 3c432e1186)
 2011-07-12 18:13:35 +02:00
Christian SchmidtandReinhard Tartler 8e3d264fb2 libxvid: add missing include of libavutil/mathematics.h 
Signed-off-by: Mans Rullgard <mans@mansr.com>

(cherry picked from commit 6c374bc0b4)
 2011-07-12 18:05:55 +02:00
Robert SwainandReinhard Tartler 46a2dc9175 vorbis: vpxenc: Add missing include for av_rescale* 
Signed-off-by: Mans Rullgard <mans@mansr.com>

(cherry picked from commit 954a653216)
 2011-07-12 18:05:55 +02:00
Carl Eugen HoyosandReinhard Tartler b9e126fbe2 ffmpeg: Fix VDPAU decoding for some H264 samples. 
(cherry picked from commit a4ab70f92e)
 2011-07-12 18:05:55 +02:00
Reinhard Tartler f95e5225fe doxygen: Drop array size declarations from Doxygen parameter names. 
Adding [] to a Doxygen parameter name clashes with Doxygen syntax.
(cherry picked from commit ff993cd7fc)
 2011-07-03 19:58:33 +02:00
Diego BiurrunandReinhard Tartler 8f536408d1 doxygen: Remove spurious documentation for non-existing function parameters. 
(cherry picked from commit 01c17c88ed)
 2011-07-03 19:58:33 +02:00
Stefano SabatiniandReinhard Tartler d734d4ce6a suggest to use av_get_bytes_per_sample() in av_get_bits_per_sample_format() doxy 
The previously suggested replacement - av_get_bits_per_sample_fmt() -
was also deprecated.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit ccfa626db8)
 2011-07-03 19:49:53 +02:00
Reinhard Tartler 2fe47b21c8 doxygen: Prefer member groups over grouping into modules 
Before this, almost all module groups have been used for grouping functions
and fields in structures semantically. This causes them to not appear
properly in the file documentation and needlessly clutters up the "Modules"
index.

Additionally, this commit streamlines some spelling and appearances.
(cherry picked from commit 21a19b7912)
 2011-07-03 19:49:53 +02:00
Reimar Döffinger b6fe44b9db Add operand size to add instructions. 
In these cases it can't be guessed from the operands (at least
not necessarily), and it seems some clang versions refuse to
compile it.
Fixes ticket #303.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
(cherry picked from commit 5c13b5bb39)
 2011-07-01 19:24:38 +02:00
Carl Eugen Hoyos 376dfd07ab Fix possible double free when encoding using xvid. 
(cherry picked from commit 315f0e3fd8)
 2011-07-01 02:41:25 +02:00
Jason Garrett-GlaserandReinhard Tartler 87eedf6943 Add new yuv444 pixfmts to avcodec_align_dimensions2 
Fixes draw_edges crashes with high-bit-depth 4:4:4 decoding.
(cherry picked from commit da55ee6ccc)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
 2011-06-29 19:46:14 +02:00
Carl Eugen Hoyos f239b91596 Fix VDPAU decoding for some H264 samples. 
(cherry picked from commit e747b091cb)
 2011-06-29 10:10:13 +02:00
Jason Garrett-GlaserandReinhard Tartler e54fd33848 H.264: disable 2tap qpel with CODEC_FLAG2_FAST and >8-bit 
2tap qpel isn't implemented yet for high bit depth, so it just breaks decoding.
(cherry picked from commit 9a0dda8b3a)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
 2011-06-27 08:39:30 +02:00
Jason Garrett-GlaserandReinhard Tartler 180faac637 H.264: fix 4:4:4 + deblocking + 8x8dct + cavlc + MBAFF 
(cherry picked from commit 2702a6f114)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
 2011-06-23 09:14:55 +02:00