[FFmpeg-cvslog] Merge commit '99ccd2ba10eac2b282c272ad9e75f082123c765a'
Michael Niedermayer
git at videolan.org
Wed Jan 23 15:59:44 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jan 23 14:54:40 2013 +0100| [fa36270c4c68589882cfeae68a037f1d191231c2] | committer: Michael Niedermayer
Merge commit '99ccd2ba10eac2b282c272ad9e75f082123c765a'
* commit '99ccd2ba10eac2b282c272ad9e75f082123c765a':
mlp: store the channel layout for each substream.
Conflicts:
libavcodec/mlp_parser.c
libavcodec/mlpdec.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fa36270c4c68589882cfeae68a037f1d191231c2
---
More information about the ffmpeg-cvslog
mailing list