[FFmpeg-cvslog] Merge commit '090c67d586e3916f9acc49e010b6389d07f97153'
Michael Niedermayer
git at videolan.org
Mon Oct 27 22:25:26 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Oct 27 22:18:03 2014 +0100| [f769671f86ed84a886a4360998ddd7f1fb0bc55d] | committer: Michael Niedermayer
Merge commit '090c67d586e3916f9acc49e010b6389d07f97153'
* commit '090c67d586e3916f9acc49e010b6389d07f97153':
matroskaenc: write correct Display{Width, Height} in stereo encoding
Conflicts:
libavformat/matroskaenc.c
See: 6103faaa51d2f46d6ccecaad9a089b4b42ff66ee
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f769671f86ed84a886a4360998ddd7f1fb0bc55d
---
More information about the ffmpeg-cvslog
mailing list