diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 10:02:07 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 10:02:07 +0200 |
| commit | ef29a95a4d60febcc7f01fbebd9969d1c8793588 (patch) | |
| tree | 1069259a524aff4e11246a9965135a4a6ee340e4 /arch.mak | |
| parent | db2de94e95c2095a781892ad7a3d472d952652a8 (diff) | |
| parent | 7b3eb745b98b04dd8a4970b9fd6c98998e858fc1 (diff) | |
| download | ffmpeg-ef29a95a4d60febcc7f01fbebd9969d1c8793588.tar.gz | |
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>
Diffstat (limited to 'arch.mak')
0 files changed, 0 insertions, 0 deletions