[FFmpeg-cvslog] Merge commit '96138e8c8da4b9397e627c934a33c22988d1192b'

Michael Niedermayer git at videolan.org
Mon Mar 31 01:56:23 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Mar 31 01:51:34 2014 +0200| [20bc5924a0caadd39e3906301754f4557e29a7fa] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=20bc5924a0caadd39e3906301754f4557e29a7fa
---





More information about the ffmpeg-cvslog mailing list