diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-23 20:33:09 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-23 20:33:09 +0100 |
| commit | ad3c5ff347a88e6a3409cee83b6e92d453e5023e (patch) | |
| tree | 78c48e1e50a5891d63dfefd0e1c17b8526446e3b /libavformat/mpegts.c | |
| parent | 67ceb42d394bcff0fd25e4e76f1a606d105334cc (diff) | |
| parent | e0046bc9c96150fa06146ace9093f06857dd7b23 (diff) | |
| download | ffmpeg-ad3c5ff347a88e6a3409cee83b6e92d453e5023e.tar.gz | |
Merge commit 'e0046bc9c96150fa06146ace9093f06857dd7b23'
* commit 'e0046bc9c96150fa06146ace9093f06857dd7b23':
movenc: Write the make and model metadata keys for mov style files
Conflicts:
libavformat/movenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mpegts.c')
0 files changed, 0 insertions, 0 deletions