diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 01:25:08 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 01:32:08 +0200 |
| commit | 314be1933e3a39abd6576184786703701ced4415 (patch) | |
| tree | 12d4b0da77869fe4adf9b7094bd0bf46908537ef /libavformat/flic.c | |
| parent | ab6091f8e21df7280f2b50fd6226bbc130fb060a (diff) | |
| parent | ac20e3ab8ed497549ee2a62754f01eee5e7a5066 (diff) | |
| download | ffmpeg-314be1933e3a39abd6576184786703701ced4415.tar.gz | |
Merge commit 'ac20e3ab8ed497549ee2a62754f01eee5e7a5066'
* commit 'ac20e3ab8ed497549ee2a62754f01eee5e7a5066':
af_amix: switch to an AVOptions-based system.
Conflicts:
libavfilter/af_amix.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/flic.c')
0 files changed, 0 insertions, 0 deletions