diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-31 01:51:34 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-31 01:55:12 +0200 |
| commit | 20bc5924a0caadd39e3906301754f4557e29a7fa (patch) | |
| tree | fed4aeb3ffa263894816cc62061f9f1e7c7b64a8 | |
| parent | 36d37edf0189985bb6320737cff6e79431dbdf6d (diff) | |
| parent | 96138e8c8da4b9397e627c934a33c22988d1192b (diff) | |
| download | ffmpeg-20bc5924a0caadd39e3906301754f4557e29a7fa.tar.gz | |
Merge commit '96138e8c8da4b9397e627c934a33c22988d1192b'
* commit '96138e8c8da4b9397e627c934a33c22988d1192b':
isom: only write the size if its non zero in mov_rewrite_dvd_sub_extradata()
Conflicts:
libavformat/isom.c
See: b6ad5893ce585ac6d0a5a4750cba6bb700dbc902
Merged-by: Michael Niedermayer <michaelni@gmx.at>
0 files changed, 0 insertions, 0 deletions