generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
31,537 Commits 24 Branches 241 Tags
Commit Graph

14752 Commits

Author SHA1 Message Date
Carl Eugen Hoyos
376dfd07ab Fix possible double free when encoding using xvid. 
(cherry picked from commit 315f0e3fd8dcbd1362276b7407dad2e97cccc4b7)
 2011-07-01 02:41:25 +02:00
Jason Garrett-Glaser
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 da55ee6ccc05efdd9006bb8c31db9012a3326857)

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 e747b091cbc6b41f3531cfdf9d1bdd34606b1df3)
 2011-06-29 10:10:13 +02:00
Jason Garrett-Glaser
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 9a0dda8b3ab07fa7be60335715a6c350c907a7b8)

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

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
 2011-06-23 09:14:55 +02:00
Jason Garrett-Glaser
13c943ffb1 H.264: fix 4:4:4 + deblocking + MBAFF 
(cherry picked from commit 7c9079ab4cf0bcf34103fc9c5e49ec1fd7dd390c)

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

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

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

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
 2011-06-23 09:13:55 +02:00
ami_stuff
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 67e7dc54049d9b51a0c2168c8265145a9aef7780)

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

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

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
 2011-06-23 08:50:36 +02:00
Diego Biurrun
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 6371ce4b0f0535a7f576b8f109d35345e3d11d7d)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
 2011-06-23 08:49:22 +02:00
Jason Garrett-Glaser
523b57b331 H.264: fix 4:4:4 + deblocking + 8x8dct + cavlc + MBAFF 
(cherry picked from commit 2702a6f114f996ddfb334f1d8ddfae50e2c7eef7)
 2011-06-23 00:39:44 +02:00
Jason Garrett-Glaser
a3589cce81 H.264: fix 4:4:4 + deblocking + MBAFF 
(cherry picked from commit 7c9079ab4cf0bcf34103fc9c5e49ec1fd7dd390c)
 2011-06-23 00:39:44 +02:00
Jason Garrett-Glaser
0820593e64 H.264: fix 4:4:4 cropping warning 
(cherry picked from commit 932db250243812380640112fd27a59bc0642bc8a)
 2011-06-23 00:39:44 +02:00
Jason Garrett-Glaser
4db2b966be H.264: reference the correct SPS in decode_scaling_matrices 
(cherry picked from commit 85a88f9c0c0fcc2fc48121db1beb5ada68d24bdc)
 2011-06-23 00:39:44 +02:00
Reimar Döffinger
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-Glaser
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 Nguyen
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
Mans Rullgard
b92c1a6d26 x86: h264: remove hardcoded esi in decode_significance[_8x8]_x86() 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-06-20 22:36:31 +01:00
Mans Rullgard
3fc4e36c78 x86: h264: remove hardcoded edx in decode_significance[_8x8]_x86() 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-06-20 22:36:31 +01:00
Mans Rullgard
e4b5a204aa x86: h264: remove hardcoded eax in decode_significance[_8x8]_x86() 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-06-20 22:36:30 +01:00
Mans Rullgard
3146a30e61 x86: cabac: change 'a' constraint to 'r' in get_cabac_inline() 
Nothing requires this value in %eax.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-06-20 22:36:30 +01:00
Mans Rullgard
f743595e87 x86: cabac: remove hardcoded esi in get_cabac_inline() 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-06-20 22:36:30 +01:00
Mans Rullgard
da3af4db61 x86: cabac: remove hardcoded edx in get_cabac_inline() 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-06-20 22:36:30 +01:00
Mans Rullgard
51f16a9bf2 x86: cabac: remove unused macro parameter 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-06-20 22:36:30 +01:00
Mans Rullgard
018c33838e x86: cabac: remove hardcoded ebx in inline asm 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-06-20 22:36:30 +01:00
Mans Rullgard
6b712acc0e x86: cabac: remove hardcoded struct offsets from inline asm 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-06-20 22:36:30 +01:00
Mans Rullgard
34ee43fc0f cabac: remove inline asm under #if 0 
A comment says it's not faster than the C code.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-06-20 22:36:30 +01:00
Mans Rullgard
8fcc0e7978 cabac: remove BRANCHLESS_CABAC_DECODER switch 
The code does not compile without this set.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-06-20 22:36:29 +01:00
Mans Rullgard
eaa2d5a90a cabac: remove #if 0 cascade under never-set #ifdef ARCH_X86_DISABLED 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-06-20 22:36:29 +01:00
Ivan Kalvachev
093768c9a4 Fix bink audio playback outside of FFmpeg. 
There are 2 known Bink audio codecs. Additionally they have
a different flavor if they are found inside Bink-b "BIKb" file.
In order to guess the correct flavor, the demuxer sets the audio
codec_tag to be the same as the file format tag.
This causes problem because same tag is used for both audio codecs.
The hack works in FFmpeg because audio codecs are identified by their
codec_id, but other players rely on standard behavior.

This fix removes the codec_tag hack and instead uses artificial
extradata format to signal the codec flavor. This would also
allow proper embedding of Bink audio in other containers.

Signed-off-by: Ivan Kalvachev <ikalvachev@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-06-20 23:28:55 +02:00
Ronald Bultje
20153fb8f6 error_resilience: skip last-MV predictor step if MVs are not available. 
Fixes crashes when playing broken MPEG2-TS streams.
 2011-06-20 22:18:27 +02:00
Ronald Bultje
d42aaa802e error_resilience: actually add counter when adding a MV predictor. 
Without, the predictor isn't actually used.
 2011-06-20 22:18:23 +02:00
Michael Niedermayer
3a07f5a47a qdm2: Fix alignment of local array. 
Fixes ticket270

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-06-20 21:03:59 +02:00
Ronald S. Bultje
ea6331f8bb h264-mt: fix deadlock in packets with multiple slices (e.g. MP4). 2011-06-20 10:24:33 -04:00
Michael Niedermayer
56e11d2305 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  Drop git- prefix from version labels
  Use the contents of RELEASE as version fallback instead of 'UNKNOWN'
  path64/open64: filter out unsupported flags
  Add Release Notes
  sipr: Drop unused DSPContext
  sipr: include string.h for mem*()
  sipr: Use memmove() to copy overlapped buffers.
  h264: drop some ugly casts

Conflicts:
	version.sh

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-06-20 04:07:34 +02:00
Michael Niedermayer
867b10679c Attempt to fix ticket266 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-06-20 01:58:18 +02:00
Alex Converse
4b84d5114d sipr: Drop unused DSPContext 2011-06-18 22:12:21 -07:00
Alex Converse
1e3d5eec8e sipr: include string.h for mem*() 2011-06-18 22:12:21 -07:00