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>
12 years ago
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>
12 years ago
Paul B Mahol
10b1cc63c2
lavfi: remove double .priv_class initializers
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
12 years ago
Paul B Mahol
661e284b4a
telecine filter
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
12 years ago
Nicolas George
08dd2c9df1
fate: add tests for unknown channel layouts.
12 years ago
Nicolas George
0d58bbb28d
lavfi/buffersrc: update for compatibility with the fork.
...
Merge and adapt commit d28cb84
by Anton Khirnov.
12 years ago
Clément Bœsch
2844ea86c8
lavfi/curves: introduce "all" field in presets and use it.
12 years ago
Clément Bœsch
7e7dc1489f
lavfi/curves: make possible to customize presets.
12 years ago
Clément Bœsch
a1e798ef0a
lavfi/curves: fix a spacing weirdness.
12 years ago
Michael Niedermayer
c66c92add6
doc/opencl: speling and gramer fixes
...
Found-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
highgod0401
9d442b9cc0
opencl: add spec opencl device APIs 20130411
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Anton Khirnov
f223ad1e00
doc: document the prores encoder options
...
Adapted from the author's blag.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
12 years ago
Clément Bœsch
4c9b031559
lavfi/smartblur: cleanup unused shorthand and doc.
12 years ago
Clément Bœsch
fcaea2170f
lavfi/overlay: cleanup unused shorthand.
12 years ago
Clément Bœsch
3417280b57
lavfi/field: cleanup unused shorthand and doc.
12 years ago
Paul B Mahol
310bf28354
mss4: make code independent of sizeof(AVFrame)
...
Also fixes #2455 .
Signed-off-by: Paul B Mahol <onemda@gmail.com>
12 years ago
Paul B Mahol
b6d5a948f9
mss4: use init_get_bits8()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
12 years ago
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>
12 years ago
Anton Khirnov
93e65e9a6c
Cosmetics, restore alphabetic order in atomics lists.
12 years ago
Anton Khirnov
9e6b5e61a0
img2enc: add an option for overwriting one file with subsequent images
...
Based on a patch by Michael Niedermayer <michaelni@gmx.at>.
12 years ago
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>
12 years ago
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>
12 years ago
Clément Bœsch
77add967a5
lavfi/setfield: switch to an AVOptions-based system.
12 years ago
Clément Bœsch
73c1a00e73
lavfi/asettb: switch to an AVOptions-based system.
12 years ago
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>
12 years ago
Clément Bœsch
cb2327e88d
lavfi/aselect: switch to an AVOptions-based system.
12 years ago
Clément Bœsch
bca4cafaf2
lavfi/sine: switch to an AVOptions-based system.
12 years ago
Clément Bœsch
9ceb7bdf6f
lavfi/deshake: switch to an AVOptions-based system.
12 years ago
Clément Bœsch
c85f56bb4f
lavfi/tinterlace: switch to an AVOptions-based system.
12 years ago
Clément Bœsch
64a103138c
lavfi/tile: switch to an AVOptions-based system.
12 years ago
Clément Bœsch
35a27402ad
lavfi/concat: switch to an AVOptions-based system.
12 years ago
Michael Niedermayer
944ad46182
Merge commit 'e8cafd2773bc56455c8816593cbd9368f2d69a80'
...
* commit 'e8cafd2773bc56455c8816593cbd9368f2d69a80':
h264: Clear the mb members via memset instead of using dsputil
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
3bc3c78a59
Merge commit '6d25c9db11e87ec58652de6588448225137b0c57'
...
* commit '6d25c9db11e87ec58652de6588448225137b0c57':
dsputil: Make square put/avg_pixels functions local to h264qpel
Conflicts:
libavcodec/dsputil.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
cb20ca14a3
Merge commit '2e81acc687e64d15dd93c74793060bb5a233f44d'
...
* commit '2e81acc687e64d15dd93c74793060bb5a233f44d':
x86inc: Fix number of operands for cmp* instructions
af_channelmap: fix uninitialized variable use introduced in ba8efac977
lavfi: add a bump and docs entries for the AVOptions switch
Conflicts:
Changelog
doc/APIchanges
libavfilter/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
d7e8b3d831
Merge remote-tracking branch 'ubitux/lavfi-mixed-short-long'
...
* ubitux/lavfi-mixed-short-long:
lavfi: restore mixed short/long option support with the new system.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
44d4488301
Merge commit '8114c101607843a86960bd3e0e9c40487dc2a961'
...
* commit '8114c101607843a86960bd3e0e9c40487dc2a961':
lavfi: add avfilter_get_class().
Conflicts:
libavfilter/avfilter.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Clément Bœsch
b89ce54e74
lavfi: restore mixed short/long option support with the new system.
...
process_unnamed_options() is renamed to process_options() and its code
is heavily based on av_opt_set_from_string().
12 years ago
Michael Niedermayer
0965be00fe
Merge commit '4d1f31ea44f82adfb2b712534d71e27233a4f785'
...
* commit '4d1f31ea44f82adfb2b712534d71e27233a4f785':
lavfi: make AVFilterContext export filter options.
Conflicts:
libavfilter/avfilter.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
c7b0a84e1f
Merge commit '62549f9655c48f0ec061087fa33a96040ce01145'
...
* commit '62549f9655c48f0ec061087fa33a96040ce01145':
lavfi: error out when options are provided to a filter that does not take any
Conflicts:
libavfilter/avfilter.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
31428240ec
Merge commit 'c43a7ecad997fc527af34b952334f3d030709a1b'
...
* commit 'c43a7ecad997fc527af34b952334f3d030709a1b':
lavfi: remove now unused args parameter from AVFilter.init
Conflicts:
libavfilter/avfilter.c
libavfilter/buffersrc.c
libavfilter/f_select.c
libavfilter/src_movie.c
libavfilter/vf_alphamerge.c
libavfilter/vf_drawtext.c
libavfilter/vf_lut.c
Not merged (yet) because there are still many filters that use the args
parameter.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
ef29a95a4d
Merge commit '7b3eb745b98b04dd8a4970b9fd6c98998e858fc1'
...
* commit '7b3eb745b98b04dd8a4970b9fd6c98998e858fc1':
vsrc_testsrc: switch to an AVOptions-based system.
Conflicts:
doc/filters.texi
libavfilter/vsrc_testsrc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
highgod0401
db2de94e95
avutil/opencl: add opencl device list APIs 20130411
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
3a3d984445
Merge commit 'a42d6e6c4c19912b73cae8ca9133b4202667c303'
...
* commit 'a42d6e6c4c19912b73cae8ca9133b4202667c303':
vsrc_movie: switch to an AVOptions-based system.
Conflicts:
doc/filters.texi
libavfilter/src_movie.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
670e0f7f66
Merge commit 'b7b3302f8f2c7d9f6e08e0a976890eefe3edcc9e'
...
* commit 'b7b3302f8f2c7d9f6e08e0a976890eefe3edcc9e':
vsrc_nullsrc: switch to an AVOptions-based system.
Conflicts:
libavfilter/vsrc_nullsrc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
8bafd83aaa
Merge commit '7bc1a883c9158bb6e383d86fc76bdf2541e9a9fe'
...
* commit '7bc1a883c9158bb6e383d86fc76bdf2541e9a9fe':
vsrc_color: switch to an AVOptions-based system.
Conflicts:
doc/filters.texi
libavfilter/vsrc_color.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
7f2198a2f1
Merge commit '73d5d405d424c06f3f354337cfdb24794932094d'
...
* commit '73d5d405d424c06f3f354337cfdb24794932094d':
split: switch to an AVOptions-based system.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
ae6634da8b
Merge commit 'b13623e184759f37348b8fdb1276b1bb408f3e59'
...
* commit 'b13623e184759f37348b8fdb1276b1bb408f3e59':
af_volume: switch to an AVOptions-based system.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Diego Biurrun
ac9362c5d9
Move misplaced file author information where it belongs
12 years ago
Michael Niedermayer
8905a811b7
Merge remote-tracking branch 'richardpl/biquads'
...
* richardpl/biquads:
lavfi/biquads: switch to an AVOptions-based system
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
42c70b3584
Merge commit 'dd7fc37c71955b78a2687f29e871f714d18de386'
...
* commit 'dd7fc37c71955b78a2687f29e871f714d18de386':
af_join: switch to an AVOptions-based system.
Conflicts:
doc/filters.texi
libavfilter/af_join.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago