diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-10 17:49:13 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-10 17:54:20 +0200 |
| commit | eebe0b02245c7aa9a0f14cc24c2e540ca758f5c9 (patch) | |
| tree | e96e0b7c7741bfec5efad12d966d2d1465ebb523 /doc/RELEASE_NOTES | |
| parent | 1c3cdf533ba0f47e70b166b335fe3282264950d7 (diff) | |
| parent | 63e58c55c17d7f8b5eec9c082fe0f8edc305a24e (diff) | |
| download | ffmpeg-eebe0b02245c7aa9a0f14cc24c2e540ca758f5c9.tar.gz | |
Merge commit '63e58c55c17d7f8b5eec9c082fe0f8edc305a24e'
* commit '63e58c55c17d7f8b5eec9c082fe0f8edc305a24e':
vf_delogo: switch to an AVOptions-based system.
Conflicts:
libavfilter/vf_delogo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/RELEASE_NOTES')
0 files changed, 0 insertions, 0 deletions