diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-09 01:41:55 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-09 01:41:55 +0100 |
| commit | 4cb6814160d074df5d7cbb5b4a2059e7757bbaa6 (patch) | |
| tree | f69561c415ffb2f5d376c0c90d9cbcfb47e414b2 /libavformat/isom.c | |
| parent | b39e8950243746b88065aade3859acc167bd0bb0 (diff) | |
| parent | 0092c1dd8dac2d9e185b58503b447a0d3fb5230d (diff) | |
| download | ffmpeg-4cb6814160d074df5d7cbb5b4a2059e7757bbaa6.tar.gz | |
Merge commit '0092c1dd8dac2d9e185b58503b447a0d3fb5230d'
* commit '0092c1dd8dac2d9e185b58503b447a0d3fb5230d':
matroskaenc: allow override of "writing application" tag
Conflicts:
libavformat/matroskaenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/isom.c')
0 files changed, 0 insertions, 0 deletions