x/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-08-01 18:17:53 +00:00
Code Issues Packages Projects Releases Wiki Activity
31,036 Commits 40 Branches 429 Tags
84648d33bac2f72dcd3f07fcbb6ef22e013715a3
Commit Graph
14423 Commits
Author SHA1 Message Date
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
Jason Garrett-GlaserandReinhard Tartler 13c943ffb1 H.264: fix 4:4:4 + deblocking + MBAFF 
(cherry picked from commit 7c9079ab4c)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
 2011-06-23 09:14:53 +02:00
Jason Garrett-GlaserandReinhard Tartler 18052f1df9 H.264: fix 4:4:4 cropping warning 
(cherry picked from commit 932db25024)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
 2011-06-23 09:14:51 +02:00
Jason Garrett-GlaserandReinhard Tartler 4c8b14c37f H.264: reference the correct SPS in decode_scaling_matrices 
(cherry picked from commit 85a88f9c0c)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
 2011-06-23 09:14:48 +02:00
Jason Garrett-GlaserandReinhard Tartler e4071fa04c H.264: fix bug in lossless 4:4:4 decoding 
Coefficient test for i16x16 add_pixels4 assumed luma plane.
(cherry picked from commit 3b79f2e2e9)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
 2011-06-23 09:13:55 +02:00
ami_stuffandReinhard Tartler fcd26ebc8f rawdec: Fix decoding of QT WRAW files. 
From some tests it results that:
1. All of the AVI/MOV WRAW files need to be flipped.
2. MOV WRAW files need to use AVI color modes.
3. Assigning PAL8 mode by default to WRAW codec is not correct.
(cherry picked from commit 67e7dc5404)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
 2011-06-23 08:50:37 +02:00
Carl Eugen HoyosandReinhard Tartler 26f48752fb mov: Support Digital Voodoo SD 8 Bit and DTS codec identifiers. 
(cherry picked from commit 53d5cd2c82)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
 2011-06-23 08:50:37 +02:00
ami_stuffandReinhard Tartler 6cef3ddbdc rawvideo: Support auv2 fourcc. 
(cherry picked from commit d352df0931)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
 2011-06-23 08:50:36 +02:00
Diego BiurrunandReinhard Tartler 403eee165c h264: Fix assert that failed to compile with -DDEBUG. 
The assert referenced a variable that no longer exists since 4:4:4 support.
(cherry picked from commit 6371ce4b0f)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
 2011-06-23 08:49:22 +02:00
Jason Garrett-GlaserandMichael Niedermayer 523b57b331 H.264: fix 4:4:4 + deblocking + 8x8dct + cavlc + MBAFF 
(cherry picked from commit 2702a6f114)
 2011-06-23 00:39:44 +02:00
Jason Garrett-GlaserandMichael Niedermayer a3589cce81 H.264: fix 4:4:4 + deblocking + MBAFF 
(cherry picked from commit 7c9079ab4c)
 2011-06-23 00:39:44 +02:00
Jason Garrett-GlaserandMichael Niedermayer 0820593e64 H.264: fix 4:4:4 cropping warning 
(cherry picked from commit 932db25024)
 2011-06-23 00:39:44 +02:00
Jason Garrett-GlaserandMichael Niedermayer 4db2b966be H.264: reference the correct SPS in decode_scaling_matrices 
(cherry picked from commit 85a88f9c0c)
 2011-06-23 00:39:44 +02:00
Reimar DöffingerandMichael Niedermayer 5f654897e3 A cmp instruction with two constants is invalid, thus "g" constraint 
is not correct but must be "rm" instead.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-06-21 21:41:04 +02:00
Michael Niedermayer 3cb64e327a wma: fix infinite loop 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-06-21 13:17:10 +02:00
Jason Garrett-GlaserandCarl Eugen Hoyos da0dadb936 Fix H.264 4:4:4 lossless decoding. 
The coefficient test for i16x16 add_pixels4 assumed luma plane.
 2011-06-21 10:45:22 +02:00
Michael Niedermayer d39b33c63b libx264: fix open gop default. 
Please use -x264opts to force open gop
This fixes Ticket268

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-06-21 04:45:29 +02:00
Michael Niedermayer 6cbe81999b Merge remote-tracking branch 'qatar/master' 
* qatar/master: (28 commits)
  Replace usages of av_get_bits_per_sample_fmt() with av_get_bytes_per_sample().
  x86: cabac: fix register constraints for 32-bit mode
  cabac: move x86 asm to libavcodec/x86/cabac.h
  x86: h264: cast pointers to intptr_t rather than int
  x86: h264: remove hardcoded edi in decode_significance_8x8_x86()
  x86: h264: remove hardcoded esi in decode_significance[_8x8]_x86()
  x86: h264: remove hardcoded edx in decode_significance[_8x8]_x86()
  x86: h264: remove hardcoded eax in decode_significance[_8x8]_x86()
  x86: cabac: change 'a' constraint to 'r' in get_cabac_inline()
  x86: cabac: remove hardcoded esi in get_cabac_inline()
  x86: cabac: remove hardcoded edx in get_cabac_inline()
  x86: cabac: remove unused macro parameter
  x86: cabac: remove hardcoded ebx in inline asm
  x86: cabac: remove hardcoded struct offsets from inline asm
  cabac: remove inline asm under #if 0
  cabac: remove BRANCHLESS_CABAC_DECODER switch
  cabac: remove #if 0 cascade under never-set #ifdef ARCH_X86_DISABLED
  document libswscale bump
  error_resilience: skip last-MV predictor step if MVs are not available.
  error_resilience: actually add counter when adding a MV predictor.
  ...

Conflicts:
	Changelog
	libavcodec/error_resilience.c
	libavfilter/defaults.c
	libavfilter/vf_drawtext.c
	libswscale/swscale.h
	tests/ref/vsynth1/error
	tests/ref/vsynth2/error

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-06-21 03:38:25 +02:00
Michael Niedermayer b37dfe181c mpegaudio_parser: be less picky on the start position 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-06-21 03:07:11 +02:00
Kim NguyenandMichael Niedermayer 2d16394f97 ppc32: Fix movrel 
Fixes ticket272
 2011-06-21 03:06:54 +02:00
Justin Ruggles e6c52cee54 Replace usages of av_get_bits_per_sample_fmt() with av_get_bytes_per_sample(). 
av_get_bits_per_sample_fmt() is deprecated.
 2011-06-20 18:56:06 -04:00
Mans Rullgard c5ee740745 x86: cabac: fix register constraints for 32-bit mode 
Some operands need to be accessed in byte mode, which restricts the
available registers in 32-bit mode.  Using the 'q' constraint selects
a suitable register.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-06-20 23:36:40 +01:00
Mans Rullgard 2143d69bdd cabac: move x86 asm to libavcodec/x86/cabac.h 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-06-20 22:36:31 +01:00
Mans Rullgard d075e7d540 x86: h264: cast pointers to intptr_t rather than int 
Only the low-order bits are used here so the type is not important,
but this avoids a compiler warning.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-06-20 22:36:31 +01:00
Mans Rullgard 3a4edb76d6 x86: h264: remove hardcoded edi in decode_significance_8x8_x86() 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-06-20 22:36:31 +01:00