virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-08 13:22:53 +02:00
Code Issues Releases Activity
51,221 Commits 37 Branches 400 Tags 470 MiB
89b4e758d3
Commit Graph

51221 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Clément Bœsch
89b4e758d3 lavfi/blend: always peek the first frame of each queue. 
Before the change, filter_frame() always waited for 2 samples in the
bottom frames queue. This notably fixes commands such as
./ffplay tests/lena.pnm -vf split,blend=c0_mode=addition
 2013-03-22 23:09:08 +01:00
Clément Bœsch
859f7da543 lavc/prores: restore pict_type and key_frame setting. 2013-03-22 23:05:50 +01:00
Michael Niedermayer
b3e9f266e8 x86/mpegvideo: switch to av_assert 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-22 22:57:23 +01:00
Michael Niedermayer
cdbf8409ef x86/h264_qpel: switch to av_assert 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-22 22:57:08 +01:00
Carl Eugen Hoyos
1ed10bd89c Fix typo in dvvideo decoder dependencies. 
Fixes compilation with --disable-everything --enable-decoder=dvvideo
 2013-03-22 21:37:17 +01:00
Michael Niedermayer
428e9dafab h263dec: switch to av_assert() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-22 18:07:26 +01:00
Michael Niedermayer
ac75e0c755 matroskadec: switch to av_assert 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-22 18:04:17 +01:00
Michael Niedermayer
076c1c956c vp8: WebP decoding support 
VP8L, padding and bounds checks by Pascal Massimino

Reviewed-by: Pascal Massimino <pascal.massimino@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-22 14:57:56 +01:00
Michael Niedermayer
c0ff2aaa49 img2: WebP support 
Reviewed-by: Pascal Massimino <pascal.massimino@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-22 14:57:27 +01:00
Carl Eugen Hoyos
e0e8c20559 Fix compilation with --disable-everything --enable-parser=h264. 2013-03-22 13:32:35 +01:00
Carl Eugen Hoyos
d98a5318fd Fix compilation with --disable-mmx. 2013-03-22 13:00:50 +01:00
Michael Niedermayer
abbc34c372 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  configure: Enable hwaccels without external dependencies by default.
  doc/developer: Clarify symbol naming prefixes section.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-22 12:58:22 +01:00
Clément Bœsch
77f60f0011 lavu/eval: add between() function. 2013-03-22 09:20:45 +01:00
Carl Eugen Hoyos
ac9b056ddb Do not fail in get_buffer_internal() if pix_fmt planes == 0. 
Fixes VDPAU decoding, reported by Ilja Sekler
 2013-03-22 01:03:07 +01:00
Michael Niedermayer
21a5f5ea5d error_resilience: fix const correctness, silence warnings 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-21 23:32:37 +01:00
Michael Niedermayer
732b2fde1c vdpau.h: change vdpau_render_state layout to match fork if AV_HAVE_INCOMPATIBLE_FORK_ABI 
This might fix a compatibility issue.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-21 23:22:33 +01:00
Andrew Euell
f8217daa8e vda_h264: fix for VDA compile 
the VDA code needs to be updated to use the CHROMA(h) macros

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-21 19:56:19 +01:00
Michael Niedermayer
4aa8503399 sonicdec: update to new buffer API 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-21 16:01:53 +01:00
Michael Niedermayer
85d7f54662 sonicenc: fix mono decorrelation 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-21 15:49:22 +01:00
Michael Niedermayer
6ec037c5a9 sonicdec: fix frame size 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-21 15:46:16 +01:00
Michael Niedermayer
1426291eb8 sonicdec: check decorrelation 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-21 15:45:59 +01:00
Michael Niedermayer
8251c05320 g729dec: switch to buffer refs style 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-21 14:48:56 +01:00
Michael Niedermayer
a728a28dac v308dec: remove unneeded self assignment 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-21 14:43:09 +01:00
Diego Biurrun
2e2ec66741 configure: Enable hwaccels without external dependencies by default. 2013-03-21 14:19:03 +01:00
Diego Biurrun
72ad96c854 doc/developer: Clarify symbol naming prefixes section. 2013-03-21 14:17:37 +01:00
Michael Niedermayer
4257b804e2 ffmpeg: Replace -deinterlace (which was broken by the buffer ref stuff) with yadif injection 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-21 13:54:04 +01:00
Michael Niedermayer
f3980b75f8 h264: remove unused variable 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-21 13:17:55 +01:00
Michael Niedermayer
de8049d27c h264: add an argument to CHROMA for consistency 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-21 13:17:19 +01:00
Michael Niedermayer
881050d229 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  h264: remove redundant freeing of DPB in h264_decode_end

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-21 13:10:57 +01:00
Michael Niedermayer
86d9d349cc Merge commit '23e85be58fc64b2e804e68b0034a08a6d257e523' 
* commit '23e85be58fc64b2e804e68b0034a08a6d257e523':
  h264: add a parameter to the CHROMA444 macro.
  h264: add a parameter to the CHROMA422 macro.

Conflicts:
	libavcodec/h264.c
	libavcodec/h264.h
	libavcodec/h264_cavlc.c
	libavcodec/h264_loopfilter.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-21 13:06:14 +01:00
Michael Niedermayer
92656787cf Merge commit '6d2b6f21eb45ffbda1103c772060303648714832' 
* commit '6d2b6f21eb45ffbda1103c772060303648714832':
  h264: add a parameter to the CABAC macro.
  h264: add a parameter to the FIELD_OR_MBAFF_PICTURE macro.

Conflicts:
	libavcodec/h264.c
	libavcodec/h264_cabac.c
	libavcodec/h264_cavlc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-21 12:58:00 +01:00
Michael Niedermayer
bf4d0f8328 Merge commit '7fa00653a550c0d24b3951c0f9fed6350ecf5ce4' 
* commit '7fa00653a550c0d24b3951c0f9fed6350ecf5ce4':
  h264: add a parameter to the FIELD_PICTURE macro.
  h264: add a parameter to the FRAME_MBAFF macro.

Conflicts:
	libavcodec/h264.c
	libavcodec/h264_loopfilter.c
	libavcodec/h264_refs.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-21 12:50:18 +01:00
Michael Niedermayer
e168b50816 Merge commit 'da6be8fcec16a94d8084bda8bb8a0a411a96bcf7' 
* commit 'da6be8fcec16a94d8084bda8bb8a0a411a96bcf7':
  h264: add a parameter to the MB_FIELD macro.
  h264: add a parameter to the MB_MBAFF macro.

Conflicts:
	libavcodec/h264.c
	libavcodec/h264_cabac.c
	libavcodec/h264_cavlc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-21 12:43:32 +01:00
Michael Niedermayer
137df692fc Merge commit '48d0fd2d62a476e1db9298163f1fc0abae26cc67' 
* commit '48d0fd2d62a476e1db9298163f1fc0abae26cc67':
  h264: merge common_init() into ff_h264_decode_init.

Conflicts:
	libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-21 12:34:59 +01:00
Michael Niedermayer
bbc0f6f978 Merge commit '25408b2a0660c1e6c8555559c4ed71dff2ede31e' 
* commit '25408b2a0660c1e6c8555559c4ed71dff2ede31e':
  h264: make ff_h264_frame_start static.

Conflicts:
	libavcodec/h264.c
	libavcodec/h264.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-21 12:05:13 +01:00
Michael Niedermayer
6c8ac2d782 Merge commit '1c4073efd24164ac6eaa52c544f5cdb0e5f6aee5' 
* commit '1c4073efd24164ac6eaa52c544f5cdb0e5f6aee5':
  fate: add tests for h264 decoder reinit
  h264: fix bit depth changes with frame threading

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-21 11:56:29 +01:00
Michael Niedermayer
82f95d7fd7 h264: drop special case for 9bit chroma422 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-21 11:51:26 +01:00
Anton Khirnov
fcf75022d7 h264: remove redundant freeing of DPB in h264_decode_end 
free_tables() frees it already.
 2013-03-21 10:21:11 +01:00
Anton Khirnov
23e85be58f h264: add a parameter to the CHROMA444 macro. 
This way it does not look like a constant.
 2013-03-21 10:21:02 +01:00
Anton Khirnov
e962bd08ee h264: add a parameter to the CHROMA422 macro. 
This way it does not look like a constant.
 2013-03-21 10:20:58 +01:00
Anton Khirnov
6d2b6f21eb h264: add a parameter to the CABAC macro. 
This way it does not look like a constant.
 2013-03-21 10:20:52 +01:00
Anton Khirnov
a6931d8ece h264: add a parameter to the FIELD_OR_MBAFF_PICTURE macro. 
This way it does not look like a constant.
 2013-03-21 10:20:48 +01:00
Anton Khirnov
7fa00653a5 h264: add a parameter to the FIELD_PICTURE macro. 
This way it does not look like a constant.
 2013-03-21 10:20:44 +01:00
Anton Khirnov
7bece9b22f h264: add a parameter to the FRAME_MBAFF macro. 
This way it does not look like a constant.
 2013-03-21 10:20:39 +01:00
Anton Khirnov
da6be8fcec h264: add a parameter to the MB_FIELD macro. 
This way it does not look like a constant.
 2013-03-21 10:20:35 +01:00
Anton Khirnov
82313eaa34 h264: add a parameter to the MB_MBAFF macro. 
This way it does not look like a constant.
 2013-03-21 10:20:30 +01:00
Anton Khirnov
48d0fd2d62 h264: merge common_init() into ff_h264_decode_init. 
There is no point in keeping those separate.
 2013-03-21 10:20:10 +01:00
Anton Khirnov
25408b2a06 h264: make ff_h264_frame_start static. 
It is not called from outside h264.c
 2013-03-21 10:19:54 +01:00
Paul B Mahol
c5b484e616 lavfi/vf_stereo3d: use standard options parsing 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-03-21 09:17:32 +00:00
Stephen Hutchinson
cedf27651d Provide local copies of AviSynth's and AvxSynth's requisite headers in compat/avisynth/. 
The versions of the headers are the same as those provided with x264
for consistency's sake.
 2013-03-21 04:23:24 +01:00