diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 03:20:43 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 03:20:43 +0200 |
| commit | 670e0f7f66207227d70898b07fe0eace767cd027 (patch) | |
| tree | 27079411eb3b76266d52dd126ec1ec3d189b3ff2 /tests/fate/qt.mak | |
| parent | 8bafd83aaafad42e64acfe3646e5b4b3597982fd (diff) | |
| parent | b7b3302f8f2c7d9f6e08e0a976890eefe3edcc9e (diff) | |
| download | ffmpeg-670e0f7f66207227d70898b07fe0eace767cd027.tar.gz | |
Merge commit 'b7b3302f8f2c7d9f6e08e0a976890eefe3edcc9e'
* commit 'b7b3302f8f2c7d9f6e08e0a976890eefe3edcc9e':
vsrc_nullsrc: switch to an AVOptions-based system.
Conflicts:
libavfilter/vsrc_nullsrc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate/qt.mak')
0 files changed, 0 insertions, 0 deletions