ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-19 21:06:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,954 Commits 36 Branches 398 Tags 535 MiB
c9584f0c9c
Commit Graph

30954 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Clément Bœsch
c9584f0c9c vf_mp: do not add duplicated pixel formats. 
This avoid a crash with in avfilter_merge_formats() in case one of the
filter formats list has multiple time the same entry.

Thanks to Mina Nagy Zaki for helping figuring out the issue.
 2011-06-22 19:05:00 +02:00
Stefano Sabatini
f4228097e4 lavfi: minor style fixes in formats.c 2011-06-22 18:28:28 +02:00
Philip Langdale
b2ad33dead CrystalHD: Always identify H.264 streams as Annex B. 
Now that we're converting all streams to Annex B format, we
can identify them as such to the hardware.

Signed-off-by: Philip Langdale <philipl@overt.org>
 2011-06-21 21:03:46 -07:00
Philip Langdale
63e0697294 CrystalHD: Always send filtered H.264 stream to hardware. 
As we're now always running mp4 format streams through the annex b
filter, it makes sense to pass the filtered stream down, as
libcrystalhd would be doing the conversion internally anyway.

Signed-off-by: Philip Langdale <philipl@overt.org>
 2011-06-21 21:03:43 -07:00
Philip Langdale
edf5fbd5b2 CrystalHD: Simplfy extradata handling for non-Annex B content. 
Originally, we needed to restore the original extradata after
initialising the mp4toannexb filter because mplayer would end up
taking two passes through the init sequence for the same stream
and end up miscategorising the stream. This doesn't seem to happen
anymore, making the backup/restore process unnecessary.

Signed-off-by: Philip Langdale <philipl@overt.org>
 2011-06-21 21:03:40 -07:00
Michael Niedermayer
043d2affbb Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  rawdec: Fix decoding of QT WRAW files.
  configure: report optimization for size separately
  mov: Support Digital Voodoo SD 8 Bit and DTS codec identifiers.
  mov: Support R10g codec identifier.
  riff/img2: Add JPEG 2000 codec IDs.
  riff: Add DAVC fourcc.
  riff: Add M263, XVIX, MMJP, CDV5 fourccs.
  rawvideo: Support auv2 fourcc.
  swscale: Remove unused variable from ff_bfin_get_unscaled_swscale().
  h264: Fix assert that failed to compile with -DDEBUG.
  h264: Add x86 assembly for 10-bit weight/biweight H.264 functions.
  fate: remove output redirections from old regtest scripts

Conflicts:
	configure
	libavcodec/rawdec.c
	libavformat/isom.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-06-22 05:16:40 +02:00
ami_stuff
67e7dc5404 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.
 2011-06-21 22:18:59 +02:00
Mans Rullgard
f082a0fb42 configure: report optimization for size separately 
This removes an unsightly override of the 'optimizations' setting
only to make the configure report print 'small' when --enable-small
is used.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-06-21 20:47:10 +01:00
Clément Bœsch
86824c1dcb ffplay: do not init SDL audio if -an is specified. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-06-21 21:41:31 +02:00
Clément Bœsch
4a34e54b0e Fix zero-length gnu_printf format string warning. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-06-21 21:41:28 +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
Carl Eugen Hoyos
53d5cd2c82 mov: Support Digital Voodoo SD 8 Bit and DTS codec identifiers. 2011-06-21 21:39:00 +02:00
ami_stuff
7ac639654f mov: Support R10g codec identifier. 2011-06-21 21:38:59 +02:00
Kamil Nowosad
a304a83362 riff/img2: Add JPEG 2000 codec IDs. 2011-06-21 21:38:59 +02:00
ami_stuff
2ea1ca1714 riff: Add DAVC fourcc. 
This fourcc is used by the "mpegable AVC" codec and files encoded with
this codec decode correctly with our H.264 decoder.
 2011-06-21 21:38:58 +02:00
Carl Eugen Hoyos
682a20114e riff: Add M263, XVIX, MMJP, CDV5 fourccs. 2011-06-21 21:38:53 +02:00
ami_stuff
d352df0931 rawvideo: Support auv2 fourcc. 2011-06-21 21:33:58 +02:00
Michael Niedermayer
250cebeb3b release_notes: document not fully understood mingw-sdl issue 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-06-21 20:58:39 +02:00
Diego Biurrun
087d93f568 swscale: Remove unused variable from ff_bfin_get_unscaled_swscale(). 2011-06-21 20:53:52 +02:00
Diego Biurrun
6371ce4b0f h264: Fix assert that failed to compile with -DDEBUG. 
The assert referenced a variable that no longer exists since 4:4:4 support.
 2011-06-21 20:52:45 +02:00
Michael Niedermayer
0452f77f49 release_notes: some updates 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-06-21 18:16:16 +02:00
Michael Niedermayer
e1674d7ef7 presets: forgotten libvpx presets 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-06-21 17:52:16 +02:00
Michael Niedermayer
9b80c51066 release_notes: fix version 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-06-21 17:08:01 +02:00
Michael Niedermayer
c0c5053587 release_notes: mention more codecs 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-06-21 17:06:35 +02:00
Michael Niedermayer
5114e36d08 release_notes: there will be 2 releases each for one ABI/API. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-06-21 17:02:14 +02:00
Michael Niedermayer
6324a5a4a2 release_notes: suggest git log instead of the poorly maintained APIChanges 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-06-21 16:43:45 +02:00
Michael Niedermayer
3afc647eda release_notes: we do support releases 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-06-21 16:42:32 +02:00
Michael Niedermayer
ad3ac1d507 build system: disable memalign on haiku, its not reliable there. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-06-21 16:36:23 +02:00
Daniel Kang
84e70ef004 h264: Add x86 assembly for 10-bit weight/biweight H.264 functions. 
Mainly ported from 8-bit H.264 weight/biweight.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2011-06-21 15:24:13 +02:00
Michael Niedermayer
06724c5f5d ffprobe: remove duplicate avformat_alloc_context() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-06-21 14:38:58 +02:00
Gavin Kinsey
df1768d0a2 Fix segmentation fault in ffprobe 2011-06-21 14:37:28 +02:00
Mans Rullgard
ea57502c82 fate: remove output redirections from old regtest scripts 
All tests are run through the fate-run.sh script which already
sets up redirections.  Using the outputs set there simplifies
things somewhat.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-06-21 12:37:58 +01: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
90c6963dae avfilter picture pool: double free hotfix 
This fix introduces a small memleak

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-06-21 04:24:03 +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