[FFmpeg-cvslog] Merge commit 'ed1b01131e662c9086b27aaaea69684d8575fbea'
Michael Niedermayer
git at videolan.org
Wed Jan 23 16:49:27 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jan 23 16:44:30 2013 +0100| [826188d27acdef6bf14edf018415e958f59ecfdd] | committer: Michael Niedermayer
Merge commit 'ed1b01131e662c9086b27aaaea69684d8575fbea'
* commit 'ed1b01131e662c9086b27aaaea69684d8575fbea':
mlp: implement support for AVCodecContext.request_channel_layout.
Conflicts:
libavcodec/mlpdec.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=826188d27acdef6bf14edf018415e958f59ecfdd
---
More information about the ffmpeg-cvslog
mailing list