aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'a42d6e6c4c19912b73cae8ca9133b4202667c303'Michael Niedermayer2013-04-113-35/+23
|\ | | | | | | | | | | | | | | | | | | | | * 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>
| * vsrc_movie: switch to an AVOptions-based system.Anton Khirnov2013-04-092-29/+15
| |
* | Merge commit 'b7b3302f8f2c7d9f6e08e0a976890eefe3edcc9e'Michael Niedermayer2013-04-112-5/+4
|\| | | | | | | | | | | | | | | | | | | * commit 'b7b3302f8f2c7d9f6e08e0a976890eefe3edcc9e': vsrc_nullsrc: switch to an AVOptions-based system. Conflicts: libavfilter/vsrc_nullsrc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vsrc_nullsrc: switch to an AVOptions-based system.Anton Khirnov2013-04-091-21/+20
| |
* | Merge commit '7bc1a883c9158bb6e383d86fc76bdf2541e9a9fe'Michael Niedermayer2013-04-112-16/+25
|\| | | | | | | | | | | | | | | | | | | | | * 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>
| * vsrc_color: switch to an AVOptions-based system.Anton Khirnov2013-04-092-16/+29
| |
* | Merge commit '73d5d405d424c06f3f354337cfdb24794932094d'Michael Niedermayer2013-04-112-11/+39
|\| | | | | | | | | | | | | * commit '73d5d405d424c06f3f354337cfdb24794932094d': split: switch to an AVOptions-based system. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * split: switch to an AVOptions-based system.Anton Khirnov2013-04-091-11/+37
| |
* | Merge commit 'b13623e184759f37348b8fdb1276b1bb408f3e59'Michael Niedermayer2013-04-112-4/+2
|\| | | | | | | | | | | | | * commit 'b13623e184759f37348b8fdb1276b1bb408f3e59': af_volume: switch to an AVOptions-based system. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * af_volume: switch to an AVOptions-based system.Anton Khirnov2013-04-091-11/+2
| |
* | Merge remote-tracking branch 'richardpl/biquads'Michael Niedermayer2013-04-112-7/+9
|\ \ | | | | | | | | | | | | | | | | | | * richardpl/biquads: lavfi/biquads: switch to an AVOptions-based system Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | lavfi/biquads: switch to an AVOptions-based systemPaul B Mahol2013-04-112-7/+9
| | | | | | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | | Merge commit 'dd7fc37c71955b78a2687f29e871f714d18de386'Michael Niedermayer2013-04-113-9/+14
|\ \ \ | |/ / |/| / | |/ | | | | | | | | | | | | | | * 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>
| * af_join: switch to an AVOptions-based system.Anton Khirnov2013-04-092-10/+13
| | | | | | | | | | | | Change the mappings separator from comma to '|' to avoid excessive escaping, since comma is already used for separating filters in the filtergraph description.
* | Merge remote-tracking branch 'richardpl/framestep'Michael Niedermayer2013-04-113-39/+20
|\ \ | | | | | | | | | | | | | | | | | | | | | * richardpl/framestep: lavfi/framestep: remove request_frame hack lavfi/framestep: switch to an AVOptions-based system Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | lavfi/framestep: remove request_frame hackPaul B Mahol2013-04-111-19/+2
| | | | | | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
| * | lavfi/framestep: switch to an AVOptions-based systemPaul B Mahol2013-04-113-21/+19
| | | | | | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | | Merge commit '3f14febbdf7c93bbd186399da27991180e5916b6'Michael Niedermayer2013-04-112-6/+2
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | * commit '3f14febbdf7c93bbd186399da27991180e5916b6': af_channelsplit: switch to an AVOptions-based system. Conflicts: libavfilter/af_channelsplit.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | af_channelsplit: switch to an AVOptions-based system.Anton Khirnov2013-04-091-7/+1
| | |
* | | Merge commit 'ba8efac977f4276f05274947b2b67d144cbc965a'Michael Niedermayer2013-04-114-27/+24
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ba8efac977f4276f05274947b2b67d144cbc965a': af_channelmap: switch to an AVOptions-based system. Conflicts: doc/filters.texi libavfilter/af_channelmap.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | af_channelmap: switch to an AVOptions-based system.Anton Khirnov2013-04-093-27/+22
| | |
* | | Merge remote-tracking branch 'mbouron/shorthand-cleanup'Michael Niedermayer2013-04-116-20/+5
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * mbouron/shorthand-cleanup: lavfi/aphaser: switch to AVOption-based system lavfi/apad: switch to AVOption-based system lavfi/afade: switch to AVOption-base system lavfi/blend: switch to AVOption-based system Conflicts: libavfilter/avfilter.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | lavfi/aphaser: switch to AVOption-based systemMatthieu Bouron2013-04-113-6/+1
| | |
| * | lavfi/apad: switch to AVOption-based systemMatthieu Bouron2013-04-112-3/+1
| | |
| * | lavfi/afade: switch to AVOption-base systemMatthieu Bouron2013-04-113-6/+1
| | |
| * | lavfi/blend: switch to AVOption-based systemMatthieu Bouron2013-04-113-5/+2
| | |
* | | Merge commit 'b2b25b0659fa047da6266d2ce165d43011136b30'Michael Niedermayer2013-04-112-9/+2
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | * commit 'b2b25b0659fa047da6266d2ce165d43011136b30': af_asyncts: switch to an AVOptions-based system. Conflicts: libavfilter/af_asyncts.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | af_asyncts: switch to an AVOptions-based system.Anton Khirnov2013-04-091-10/+1
| | |
* | | Merge commit 'ac20e3ab8ed497549ee2a62754f01eee5e7a5066'Michael Niedermayer2013-04-112-9/+3
|\| | | |/ |/| | | | | | | | | | | | | | | * commit 'ac20e3ab8ed497549ee2a62754f01eee5e7a5066': af_amix: switch to an AVOptions-based system. Conflicts: libavfilter/af_amix.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * af_amix: switch to an AVOptions-based system.Anton Khirnov2013-04-091-10/+2
| |
* | Merge commit '7536c671040f1f3ebc9f0d3b7831dac71436b775'Michael Niedermayer2013-04-113-51/+34
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '7536c671040f1f3ebc9f0d3b7831dac71436b775': vf_yadif: switch to an AVOptions-based system. Conflicts: doc/filters.texi libavfilter/vf_yadif.c libavfilter/yadif.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vf_yadif: switch to an AVOptions-based system.Anton Khirnov2013-04-093-26/+35
| |
* | Merge remote-tracking branch 'ubitux/shorthand-cleanup'Michael Niedermayer2013-04-117-26/+18
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ubitux/shorthand-cleanup: lavfi/idet: switch to an AVOptions-based system. lavfi/histogram: switch to an AVOptions-based system. lavfi/stereo3d: switch to an AVOptions-based system. lavfi/noise: switch to an AVOptions-based system. lavfi/histeq: switch to an AVOptions-based system. Conflicts: libavfilter/avfilter.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | lavfi/idet: switch to an AVOptions-based system.Clément Bœsch2013-04-113-3/+10
| | |
| * | lavfi/histogram: switch to an AVOptions-based system.Clément Bœsch2013-04-113-4/+2
| | |
| * | lavfi/stereo3d: switch to an AVOptions-based system.Clément Bœsch2013-04-113-5/+2
| | |
| * | lavfi/noise: switch to an AVOptions-based system.Clément Bœsch2013-04-113-5/+2
| | |
| * | lavfi/histeq: switch to an AVOptions-based system.Clément Bœsch2013-04-113-9/+2
| | |
* | | Merge remote-tracking branch 'mbouron/shorthand-cleanup'Michael Niedermayer2013-04-114-12/+3
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | * mbouron/shorthand-cleanup: lavfi/kerndeint: switch to AVOption-based system lavfi/il: switch to AVOption-based system Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | lavfi/kerndeint: switch to AVOption-based systemMatthieu Bouron2013-04-113-7/+1
| | |
| * | lavfi/il: switch to AVOption-based systemMatthieu Bouron2013-04-113-5/+2
| | |
* | | Merge commit 'b83e9efc53e5491716625aa31c69006b1119b280'Michael Niedermayer2013-04-113-46/+35
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b83e9efc53e5491716625aa31c69006b1119b280': vf_unsharp: switch to an AVOptions-based system. Conflicts: doc/filters.texi libavfilter/vf_unsharp.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | vf_unsharp: switch to an AVOptions-based system.Anton Khirnov2013-04-092-24/+32
| | |
* | | Merge remote-tracking branch 'ubitux/shorthand-cleanup'Michael Niedermayer2013-04-116-35/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ubitux/shorthand-cleanup: lavfi/mptestsrc: switch to an AVOptions-based system. lavfi/mandelbrot: switch to an AVOptions-based system. lavfi/life: switch to an AVOptions-based system. lavfi/cellauto: switch to an AVOptions-based system. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | | lavfi/mptestsrc: switch to an AVOptions-based system.Clément Bœsch2013-04-113-8/+2
| | | |
| * | | lavfi/mandelbrot: switch to an AVOptions-based system.Clément Bœsch2013-04-113-9/+2
| | | |
| * | | lavfi/life: switch to an AVOptions-based system.Clément Bœsch2013-04-113-9/+2
| | | |
| * | | lavfi/cellauto: switch to an AVOptions-based system.Clément Bœsch2013-04-113-9/+2
| | |/ | |/|
* | | Merge commit '0c2466dec719b933d161f5d680a57fde38aa5daa'Michael Niedermayer2013-04-113-35/+40
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | * commit '0c2466dec719b933d161f5d680a57fde38aa5daa': vf_transpose: switch to an AVOptions-based system. Conflicts: doc/filters.texi libavfilter/vf_transpose.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | vf_transpose: switch to an AVOptions-based system.Anton Khirnov2013-04-092-28/+44
| | |