diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-08 21:59:08 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-08 21:59:08 +0100 |
| commit | 82f0f0482ed67f32414df7791e26cc473cdcb3bb (patch) | |
| tree | 598c028eae3f900578e5c89c507d68331f619000 /libavcodec/flacenc.c | |
| parent | 74622ad320bbd3e01674224e67b59b09f22c38d6 (diff) | |
| parent | 35384934d6e27e0334060a23a0c83a3cb5cef198 (diff) | |
| download | ffmpeg-82f0f0482ed67f32414df7791e26cc473cdcb3bb.tar.gz | |
Merge commit '35384934d6e27e0334060a23a0c83a3cb5cef198'
* commit '35384934d6e27e0334060a23a0c83a3cb5cef198':
mov: cosmetics: reorder the list of tags
Conflicts:
libavformat/mov.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/flacenc.c')
0 files changed, 0 insertions, 0 deletions