diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-01 20:22:51 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-01 20:25:35 +0200 |
| commit | ee78b0c252e54b7e26043d060b45c22654719ffb (patch) | |
| tree | 386d80027aea198ddca996c7a7c5121c25b1460e /libavformat/flac_picture.c | |
| parent | 8365287e613d82e8fc1e842878cbbe285c1d592d (diff) | |
| parent | b75a1f9892b5b715397edbf837e4d4cda337907b (diff) | |
| download | ffmpeg-ee78b0c252e54b7e26043d060b45c22654719ffb.tar.gz | |
Merge commit 'b75a1f9892b5b715397edbf837e4d4cda337907b'
* commit 'b75a1f9892b5b715397edbf837e4d4cda337907b':
matroska: Factor out write_track from mkv_write_tracks
Conflicts:
libavformat/matroskaenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/flac_picture.c')
0 files changed, 0 insertions, 0 deletions