James Almer
94d13df34c
Fix compilation with --disable-everything --enable-filter=deshake
...
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-11 16:33:02 +02:00
Stephen Hutchinson
ff99b42e04
avformat/avisynth: Don't insert null frames or samples at the start of a stream.
...
This is the last remaining issue from ticket #2412
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-11 16:32:14 +02:00
Paul B Mahol
d185343687
libshine fixed point MP3 encoding support
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-11 14:27:59 +00:00
Michael Niedermayer
fb78b94c3a
cmdutils_common_opts: fix indention of #if
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-11 16:07:46 +02:00
Michael Niedermayer
0a95449d2f
cmdutils: remove unneeded #if
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-11 16:07:11 +02:00
highgod0401
d757f7510b
cmdutils: add opencl command line options to ffmpeg
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-11 16:05:19 +02:00
Paul B Mahol
567feaafa8
lavfi/bbox: remove unused variables and functions
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-11 14:02:59 +00:00
Michael Niedermayer
580a0600ef
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
Move misplaced file author information where it belongs
Conflicts:
libavcodec/adpcm.c
libavcodec/adpcmenc.c
libavcodec/gif.c
libavcodec/x86/dsputilenc_mmx.c
libavcodec/x86/fmtconvert_init.c
libavformat/au.c
libavformat/gif.c
libavformat/mov.c
libavformat/nsvdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-11 15:56:18 +02:00
Clément Bœsch
ad9e66a565
lavfi: add pp to the ':'-to-'|' compat layer.
2013-04-11 15:52:46 +02:00
Michael Niedermayer
cf7d3846fc
Merge commit '9de9b828ef005dec37052548c195a6b4f18fc701'
...
* commit '9de9b828ef005dec37052548c195a6b4f18fc701':
lavc: don't overwrite display dimensions with coded dimensions.
lavc: extend / update the [coded_]{width,height} doxy
Conflicts:
libavcodec/avcodec.h
libavcodec/utils.c
The change to the w/h handling is not merged as it breaks lowres
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-11 15:42:32 +02:00
Clément Bœsch
e2e992c077
lavfi/asetnsamples: switch to an AVOptions-based system.
2013-04-11 15:40:15 +02:00
Clément Bœsch
1c0feee059
lavfi/anullsrc: switch to an AVOptions-based system.
2013-04-11 15:21:40 +02:00
Clément Bœsch
7464b9e319
lavfi: remove bbox from the filters left to update.
...
The filter doesn't take any option and thus works with the new system.
2013-04-11 15:14:07 +02:00
Paul B Mahol
11f6174a91
lavfi/blend: support more yuv pixel formats
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-11 13:10:11 +00:00
Clément Bœsch
7fdebb116c
lavfi/astreamsync: switch to an AVOptions-based system.
2013-04-11 15:09:25 +02:00
Clément Bœsch
2fb8ca7d2c
lavfi/astreamsync: fix eval memleak.
2013-04-11 15:09:25 +02:00
Michael Niedermayer
5ec016ad0b
Merge commit '20429ba96e55db17ac57f6c0e330914287f1f614'
...
* commit '20429ba96e55db17ac57f6c0e330914287f1f614':
h261: Move encoder/decoder shared table init to common code
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-11 14:48:27 +02:00
Clément Bœsch
ab4afcb85b
lavfi/blackdetect: switch to an AVOptions-based system.
2013-04-11 14:48:19 +02:00
Clément Bœsch
7eb1ea2ae6
lavfi/sendcmd: switch to an AVOptions-based system.
2013-04-11 14:40:02 +02:00
Clément Bœsch
389eb0a919
lavfi/testsrc: remove useless args/NULL passing.
2013-04-11 14:36:50 +02:00
Michael Niedermayer
dd97736d4f
avfilter: add missing ,
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-11 14:31:10 +02:00
Michael Niedermayer
567616c1b3
Merge commit '8a776ad90e00ab2b98e8683ac6182d641a383c3a'
...
* commit '8a776ad90e00ab2b98e8683ac6182d641a383c3a':
h261: Move shared data tables from a header to a proper C file
Conflicts:
libavcodec/Makefile
libavcodec/h261data.c
libavcodec/h261dec.c
libavcodec/h261enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-11 14:25:38 +02:00
Paul B Mahol
38d1a5a270
lavfi/smptebars: switch to AVOptions-based system
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-11 12:22:42 +00:00
Clément Bœsch
3c2e4c2a9b
lavfi/showwaves: switch to an AVOptions-based system.
2013-04-11 14:18:44 +02:00
Clément Bœsch
38788f2de5
lavfi: replace new filter list with filters left to update.
2013-04-11 14:06:39 +02:00
highgod0401
d83c481dc0
MAINTAINERS: add opencl maintainer
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-11 13:42:07 +02:00
Marton Balint
f1e606c762
mxfdec: update current edit unit when seeking in mxf files without index tables
...
Fixes audio packet pts values in some files generated by AVID TRMG 3.01.
Signed-off-by: Marton Balint <cus@passwd.hu>
Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-11 13:35:58 +02:00
Michael Niedermayer
eeb6efcd58
Merge remote-tracking branch 'cigaes/master'
...
* cigaes/master:
fate: add tests for unknown channel layouts.
lavfi/buffersrc: update for compatibility with the fork.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-11 13:28:24 +02:00
Paul B Mahol
32a7b858c9
lavfi: remove telecine libmpcodecs wrapper
...
Native, with more features, filter is available.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-11 11:22:11 +00:00
Paul B Mahol
10b1cc63c2
lavfi: remove double .priv_class initializers
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-11 11:13:42 +00:00
Paul B Mahol
661e284b4a
telecine filter
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-11 11:12:39 +00:00
Nicolas George
08dd2c9df1
fate: add tests for unknown channel layouts.
2013-04-11 13:09:33 +02:00
Nicolas George
0d58bbb28d
lavfi/buffersrc: update for compatibility with the fork.
...
Merge and adapt commit d28cb84
by Anton Khirnov.
2013-04-11 13:09:10 +02:00
Clément Bœsch
2844ea86c8
lavfi/curves: introduce "all" field in presets and use it.
2013-04-11 13:05:06 +02:00
Clément Bœsch
7e7dc1489f
lavfi/curves: make possible to customize presets.
2013-04-11 13:05:06 +02:00
Clément Bœsch
a1e798ef0a
lavfi/curves: fix a spacing weirdness.
2013-04-11 13:05:06 +02:00
Michael Niedermayer
c66c92add6
doc/opencl: speling and gramer fixes
...
Found-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-11 13:00:04 +02:00
highgod0401
9d442b9cc0
opencl: add spec opencl device APIs 20130411
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-11 12:46:34 +02:00
Clément Bœsch
4c9b031559
lavfi/smartblur: cleanup unused shorthand and doc.
2013-04-11 12:41:13 +02:00
Clément Bœsch
fcaea2170f
lavfi/overlay: cleanup unused shorthand.
2013-04-11 12:41:13 +02:00
Clément Bœsch
3417280b57
lavfi/field: cleanup unused shorthand and doc.
2013-04-11 12:41:13 +02:00
Paul B Mahol
310bf28354
mss4: make code independent of sizeof(AVFrame)
...
Also fixes #2455 .
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-11 10:40:15 +00:00
Paul B Mahol
b6d5a948f9
mss4: use init_get_bits8()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-11 10:40:15 +00:00
Michael Niedermayer
742c392885
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
dsputil: Make dsputil selectable
Conflicts:
configure
libavcodec/Makefile
libavcodec/x86/Makefile
libavcodec/x86/constants.c
libavcodec/x86/dsputil_mmx.c
libavcodec/x86/dsputil_mmx.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-11 12:32:29 +02:00
Michael Niedermayer
65120f628c
Merge commit '85deb51a01f1ecc5ac5faa52ad8ea141c384e23a'
...
* commit '85deb51a01f1ecc5ac5faa52ad8ea141c384e23a':
h264: Only initialize dsputil if error resilience is enabled
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-11 12:00:05 +02:00
Michael Niedermayer
a87e85fa72
Merge remote-tracking branch 'ubitux/shorthand-cleanup'
...
* ubitux/shorthand-cleanup:
lavfi/setfield: switch to an AVOptions-based system.
lavfi/asettb: switch to an AVOptions-based system.
lavfi/aselect: switch to an AVOptions-based system.
lavfi/sine: switch to an AVOptions-based system.
lavfi/deshake: switch to an AVOptions-based system.
lavfi/tinterlace: switch to an AVOptions-based system.
lavfi/tile: switch to an AVOptions-based system.
lavfi/concat: switch to an AVOptions-based system.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-11 11:54:10 +02:00
Clément Bœsch
77add967a5
lavfi/setfield: switch to an AVOptions-based system.
2013-04-11 11:53:53 +02:00
Clément Bœsch
73c1a00e73
lavfi/asettb: switch to an AVOptions-based system.
2013-04-11 11:53:53 +02:00
Michael Niedermayer
0724b4a16d
Merge commit '62844c3fd66940c7747e9b2bb7804e265319f43f'
...
* commit '62844c3fd66940c7747e9b2bb7804e265319f43f':
h264: Integrate clear_blocks calls with IDCT
Conflicts:
libavcodec/arm/h264idct_neon.S
libavcodec/h264idct_template.c
libavcodec/x86/h264_idct.asm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-11 11:53:19 +02:00
Clément Bœsch
cb2327e88d
lavfi/aselect: switch to an AVOptions-based system.
2013-04-11 11:51:48 +02:00