[FFmpeg-cvslog] Merge commit '696a74e81560889ef2fde76b045c5158a325a7a5' into release/1.1
Michael Niedermayer
git at videolan.org
Mon May 5 00:09:38 CEST 2014
ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Sun May 4 23:45:24 2014 +0200| [227ac71a60937785a5e5e21618a929ee3b887015] | committer: Michael Niedermayer
Merge commit '696a74e81560889ef2fde76b045c5158a325a7a5' into release/1.1
* commit '696a74e81560889ef2fde76b045c5158a325a7a5':
matroska: add the Opus mapping
Conflicts:
libavformat/matroska.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=227ac71a60937785a5e5e21618a929ee3b887015
---
More information about the ffmpeg-cvslog
mailing list