diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-07 02:42:15 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-07 02:42:15 +0200 |
| commit | 403367d5a95c26b3c5d72ae7aca10bae0f58a827 (patch) | |
| tree | 28536e977a17bcf1f588c52f5a50ea29298b0c4f /libavcodec/indeo2data.h | |
| parent | 71f33051e5d012ccf24d447ba7c01a867f8e77c1 (diff) | |
| parent | da9cc22d5bd5f59756c2037b02966376da2cf323 (diff) | |
| download | ffmpeg-403367d5a95c26b3c5d72ae7aca10bae0f58a827.tar.gz | |
Merge commit 'da9cc22d5bd5f59756c2037b02966376da2cf323'
* commit 'da9cc22d5bd5f59756c2037b02966376da2cf323':
movenc: add track title to tracks
Conflicts:
libavformat/movenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/indeo2data.h')
0 files changed, 0 insertions, 0 deletions