diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-12 14:25:27 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-12 14:25:27 +0200 |
| commit | 46de9ba5981531dcbfe05943448bebc5569fb3df (patch) | |
| tree | b87bb41229a7cf9cfea78b1973a6db121f60b9f4 /libavfilter/split.c | |
| parent | 6b5ec762830d2984da8d5cc4e3edd20899b9f45a (diff) | |
| parent | 1ba95a9cca57b023b9b9de071a5671fc05b05e58 (diff) | |
Merge commit '1ba95a9cca57b023b9b9de071a5671fc05b05e58'
* commit '1ba95a9cca57b023b9b9de071a5671fc05b05e58':
lavfi: add avfilter_init_dict() for initializing a filter with a dict.
Conflicts:
libavfilter/avfilter.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/split.c')
0 files changed, 0 insertions, 0 deletions