[FFmpeg-cvslog] Merge commit '48e6432407a73d5006d84609456e6e0bc3dd8fc4'
Michael Niedermayer
git at videolan.org
Tue Jul 1 21:00:20 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jul 1 20:44:05 2014 +0200| [141ee109132a2e79adf4b9067a3bef2d061967b1] | committer: Michael Niedermayer
Merge commit '48e6432407a73d5006d84609456e6e0bc3dd8fc4'
* commit '48e6432407a73d5006d84609456e6e0bc3dd8fc4':
matroska: Factor out mkv_write_stereo_mode
Conflicts:
libavformat/matroskaenc.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=141ee109132a2e79adf4b9067a3bef2d061967b1
---
More information about the ffmpeg-cvslog
mailing list