diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-11 11:03:30 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-11 11:03:30 +0100 |
| commit | 66030e8133d1e874c255c767f12d9afc84273218 (patch) | |
| tree | 95b9efe3a25ac275f31ed86f10d6af1264f9df6e /libavutil/parseutils.c | |
| parent | 46f8d838b37cf9180ebad352efd7cc76382cd093 (diff) | |
| parent | daa5a988e2ec8275ad8b724ea68f78306c271ae7 (diff) | |
| download | ffmpeg-66030e8133d1e874c255c767f12d9afc84273218.tar.gz | |
Merge commit 'daa5a988e2ec8275ad8b724ea68f78306c271ae7' into release/2.2
* commit 'daa5a988e2ec8275ad8b724ea68f78306c271ae7':
matroskaenc: allow override of "writing application" tag
Conflicts:
libavformat/matroskaenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/parseutils.c')
0 files changed, 0 insertions, 0 deletions