diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-21 16:34:29 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-21 16:34:29 +0200 |
| commit | 8ca0d74d5945339c70539d363d9132470731c8da (patch) | |
| tree | af9afdc27eae7dbb5d15fbbb0d01496800c120b2 /libavfilter/vf_overlay.c | |
| parent | 1552b850db5472f2fa023040d207779bca311820 (diff) | |
| parent | d375d6395c0a5203932d89c087f77a5757a08138 (diff) | |
| download | ffmpeg-8ca0d74d5945339c70539d363d9132470731c8da.tar.gz | |
Merge commit 'd375d6395c0a5203932d89c087f77a5757a08138' into release/1.1
* commit 'd375d6395c0a5203932d89c087f77a5757a08138':
matroskaenc: allow override of "writing application" tag
Conflicts:
libavformat/matroskaenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vf_overlay.c')
0 files changed, 0 insertions, 0 deletions