summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit '8c747d46f721cffa8ea51990805ad1d3a3a4fd0a'Michael Niedermayer2013-04-104-49/+41
|\ | | | | | | | | | | | | * commit '8c747d46f721cffa8ea51990805ad1d3a3a4fd0a': vf_hqdn3d: switch to an AVOptions-based system. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vf_hqdn3d: switch to an AVOptions-based system.Anton Khirnov2013-04-093-49/+40
| |
* | Merge commit '7ed833d78ea661d619124fd898547a900f6480bc'Michael Niedermayer2013-04-104-28/+26
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * commit '7ed833d78ea661d619124fd898547a900f6480bc': vf_gradfun: switch to an AVOptions-based system. Conflicts: doc/filters.texi libavfilter/gradfun.h libavfilter/vf_gradfun.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vf_gradfun: switch to an AVOptions-based system.Anton Khirnov2013-04-093-21/+38
| |
* | Merge commit 'c334c113d4d9e9a41bc38a3e4458d7ab21010401'Michael Niedermayer2013-04-103-34/+67
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c334c113d4d9e9a41bc38a3e4458d7ab21010401': vf_scale: switch to an AVOptions-based system. Conflicts: doc/filters.texi libavfilter/avfilter.c libavfilter/vf_scale.c scale keeps using our shorthand system due to the alternative not supporting the more complex syntactical things like 1 parameter dimensions Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vf_scale: switch to an AVOptions-based system.Anton Khirnov2013-04-093-32/+84
| |
* | Merge commit '5aa1a668cfae7f617e1a06efad20f87283badd8a'Michael Niedermayer2013-04-103-51/+107
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit '5aa1a668cfae7f617e1a06efad20f87283badd8a': vf_frei0r: switch to an AVOptions-based system. Conflicts: doc/filters.texi libavfilter/vf_frei0r.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vf_frei0r: switch to an AVOptions-based system.Anton Khirnov2013-04-093-53/+108
| |
* | vf_curves: add option to set all curves at onceMichael Niedermayer2013-04-102-1/+17
| | | | | | | | | | Reviewed-by: ubitux Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'f13ab29925883b4245da4129694af3af378d67be'Michael Niedermayer2013-04-102-4/+2
|\ \ | |/ | | | | | | | | | | | | | | | | * commit 'f13ab29925883b4245da4129694af3af378d67be': vf_fps: switch to an AVOptions-based system. Conflicts: libavfilter/vf_fps.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vf_fps: switch to an AVOptions-based system.Anton Khirnov2013-04-091-10/+1
| |
* | Merge commit 'a39c154049a2d0c4fb02a5c74f58d6986ec21cec'Michael Niedermayer2013-04-103-44/+22
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit 'a39c154049a2d0c4fb02a5c74f58d6986ec21cec': vf_fieldorder: switch to an AVOptions-based system. Conflicts: doc/filters.texi libavfilter/vf_fieldorder.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vf_fieldorder: switch to an AVOptions-based system.Anton Khirnov2013-04-092-36/+26
| |
* | Merge commit 'b9dfee9fa259dfc885508179a359dccc9e7840bd'Michael Niedermayer2013-04-103-41/+44
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit 'b9dfee9fa259dfc885508179a359dccc9e7840bd': vf_fade: switch to an AVOptions-based system. Conflicts: doc/filters.texi libavfilter/vf_fade.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vf_fade: switch to an AVOptions-based system.Anton Khirnov2013-04-092-34/+53
| |
* | Merge commit '8ec464c61c46a5d088b43d24e384d6c37b7ef14a'Michael Niedermayer2013-04-103-29/+21
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '8ec464c61c46a5d088b43d24e384d6c37b7ef14a': vf_drawtext: switch to an AVOptions-based system. Conflicts: libavfilter/vf_drawtext.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vf_drawtext: switch to an AVOptions-based system.Anton Khirnov2013-04-092-54/+37
| |
* | Merge commit '335c31293baec6e6cf5907bd29840af3de8ff735'Michael Niedermayer2013-04-103-29/+22
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit '335c31293baec6e6cf5907bd29840af3de8ff735': vf_drawbox: switch to an AVOptions-based system. Conflicts: doc/filters.texi libavfilter/vf_drawbox.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vf_drawbox: switch to an AVOptions-based system.Anton Khirnov2013-04-092-13/+25
| |
* | doc/filters: review introductory example and explanationStefano Sabatini2013-04-101-16/+23
| | | | | | | | | | | | | | | | | | In particular, fix wrong vertical mirroring command, and clarify and extend explanation. Based on a patch by littlebat <dashing.meng@gmail.com>. Should fix trac ticket #2413.
* | lavfi/amerge: drop duplicated "Buffer queue overflow" messageStefano Sabatini2013-04-101-1/+0
| | | | | | | | | | The same message is shown already by the called function ff_bufqueue_is_full().
* | ffmpeg: update error message, and make use of av_err2str() to simplifyStefano Sabatini2013-04-101-3/+1
| |
* | Merge commit '63e58c55c17d7f8b5eec9c082fe0f8edc305a24e'Michael Niedermayer2013-04-103-24/+11
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '63e58c55c17d7f8b5eec9c082fe0f8edc305a24e': vf_delogo: switch to an AVOptions-based system. Conflicts: libavfilter/vf_delogo.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vf_delogo: switch to an AVOptions-based system.Anton Khirnov2013-04-092-35/+11
| |
* | Merge commit '460e7b4f6d473d9f03ed45501221f9cb209b28fd'Michael Niedermayer2013-04-102-16/+17
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit '460e7b4f6d473d9f03ed45501221f9cb209b28fd': vf_cropdetect: switch to an AVOptions-based system. Conflicts: doc/filters.texi libavfilter/vf_cropdetect.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vf_cropdetect: switch to an AVOptions-based system.Anton Khirnov2013-04-092-10/+21
| |
* | Merge commit 'fba0156af77b11ec99edf4ee8f511b7aaa6b1891'Michael Niedermayer2013-04-103-32/+32
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit 'fba0156af77b11ec99edf4ee8f511b7aaa6b1891': vf_crop: switch to an AVOptions-based system. Conflicts: doc/filters.texi libavfilter/vf_crop.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vf_crop: switch to an AVOptions-based system.Anton Khirnov2013-04-092-26/+50
| |
* | Merge commit '51def31dbe5b6e857536de8fa428f263d64f3ae5'Michael Niedermayer2013-04-103-35/+46
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit '51def31dbe5b6e857536de8fa428f263d64f3ae5': vf_boxblur: switch to an AVOptions-based system. Conflicts: doc/filters.texi libavfilter/vf_boxblur.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vf_boxblur: switch to an AVOptions-based system.Anton Khirnov2013-04-092-28/+52
| |
* | avfilter/blackframe: add "thres" back as alternativeMichael Niedermayer2013-04-101-0/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter: support alternative keys in the alternative shorthand systemMichael Niedermayer2013-04-101-1/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '62dcdb028cc84845fd263bb09304c4c6500bda7a'Michael Niedermayer2013-04-104-96/+90
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '62dcdb028cc84845fd263bb09304c4c6500bda7a': vf_blackframe: switch to an AVOptions-based system. vf_aspect: switch to an AVOptions-based system. Conflicts: doc/filters.texi libavfilter/vf_aspect.c libavfilter/vf_blackframe.c In the aspect filter most changes are merged but not the final switch to the libav API because that is too restrictive and has difficulty handling the syntax. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vf_blackframe: switch to an AVOptions-based system.Anton Khirnov2013-04-092-34/+33
| |
| * vf_aspect: switch to an AVOptions-based system.Anton Khirnov2013-04-092-46/+87
| |
* | Merge commit 'e67a87eac814c7805d18c983c43033a8a1bd62af'Michael Niedermayer2013-04-104-33/+95
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * commit 'e67a87eac814c7805d18c983c43033a8a1bd62af': vf_(no)format: switch to an AVOptions-based system. af_aformat: switch to an AVOptions-based system. Conflicts: doc/filters.texi libavfilter/af_aformat.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vf_(no)format: switch to an AVOptions-based system.Anton Khirnov2013-04-093-10/+75
| |
| * af_aformat: switch to an AVOptions-based system.Anton Khirnov2013-04-092-25/+17
| |
* | Merge commit 'd28cb849899abd98bf2dd72f5a3dd56d441aeb27'Michael Niedermayer2013-04-100-0/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | * commit 'd28cb849899abd98bf2dd72f5a3dd56d441aeb27': buffersrc: switch to an AVOptions-based system. Conflicts: doc/filters.texi libavfilter/buffersrc.c Commit not merged, merge left to maintainer. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * buffersrc: switch to an AVOptions-based system.Anton Khirnov2013-04-092-53/+55
| |
* | Merge commit '4fa1f52e33b70029e2b621852f3af7c1ef9aecff'Michael Niedermayer2013-04-103-25/+59
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '4fa1f52e33b70029e2b621852f3af7c1ef9aecff': af_resample: switch to an AVOptions-based system. Conflicts: libavfilter/avfilter.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * af_resample: switch to an AVOptions-based system.Anton Khirnov2013-04-093-20/+53
| |
* | lavfi/overlay: add process_command callbackStefano Sabatini2013-04-103-41/+92
| |
* | lavfi/overlay: add enable expressionStefano Sabatini2013-04-103-11/+28
| | | | | | | | | | | | | | | | This expression is useful to enable/disable overlaying on the fly. Note that this can't be easily done relying on the filtergraph structure, since this implies caching issues or a null frame overlaying in the best case, which is better avoided for performance and convenience reasons.
* | lavfi/overlay: add dynamic expression evaluation supportStefano Sabatini2013-04-103-51/+150
| | | | | | | | | | | | | | | | Add support for dynamic x, y expressions evaluation. Also add support for an evaluation mode which allows to disable per-frame evaluation, so that there is no speedloss in case the expression does not depend on frame variables.
* | lavu/eval: rename "new_eval_expr()" to "make_eval_expr()"Stefano Sabatini2013-04-101-5/+5
| | | | | | | | The new name is more semantically and stilistically consistent.
* | Merge commit 'b439c992c23f3e0f3832fffd2a34a664b236c525'Michael Niedermayer2013-04-105-17/+121
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * commit 'b439c992c23f3e0f3832fffd2a34a664b236c525': lavfi: switch to an AVOptions-based system. dfa: implement missing TDLT coding method Conflicts: libavcodec/dfa.c libavfilter/avfilter.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavfi: switch to an AVOptions-based system.Anton Khirnov2013-04-094-3/+108
| |
| * dfa: implement missing TDLT coding methodKostya Shishkov2013-04-091-4/+21
| |
* | lavf: add libquvi demuxer.Clément Bœsch2013-04-107-1/+166
| |
OpenPOWER on IntegriCloud