[FFmpeg-cvslog] Merge commit '9bd4a9f4eec8c8843b54126253bb9d77af95bbb3'
Michael Niedermayer
git at videolan.org
Mon Mar 31 01:50:44 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Mar 31 01:41:21 2014 +0200| [36d37edf0189985bb6320737cff6e79431dbdf6d] | committer: Michael Niedermayer
Merge commit '9bd4a9f4eec8c8843b54126253bb9d77af95bbb3'
* commit '9bd4a9f4eec8c8843b54126253bb9d77af95bbb3':
isom: Simplify mov_rewrite_dvd_sub_extradata()
Conflicts:
libavformat/isom.c
See: f6f3c85c0eff54cebc3a45caa7a1e0454b5c9ff8
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=36d37edf0189985bb6320737cff6e79431dbdf6d
---
More information about the ffmpeg-cvslog
mailing list