[FFmpeg-cvslog] Merge commit '03391b5432a2b8b8dbc3d2db722a54dfb68737b9'
Michael Niedermayer
git at videolan.org
Mon Jun 23 00:31:04 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jun 23 00:19:41 2014 +0200| [738272826f4b3b060dfe2855df5ce11865df1ec7] | committer: Michael Niedermayer
Merge commit '03391b5432a2b8b8dbc3d2db722a54dfb68737b9'
* commit '03391b5432a2b8b8dbc3d2db722a54dfb68737b9':
build: Add missing object files for Matroska demuxer
Conflicts:
libavcodec/Makefile
libavformat/Makefile
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=738272826f4b3b060dfe2855df5ce11865df1ec7
---
More information about the ffmpeg-cvslog
mailing list