[FFmpeg-cvslog] Merge commit 'fe99c52fa99e44961a09cd1324aefd492b797fc8'
Michael Niedermayer
git at videolan.org
Wed Mar 11 20:29:06 CET 2015
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Mar 11 20:17:40 2015 +0100| [2d37c57f3e9d58916b1247e0f335065415ce1364] | committer: Michael Niedermayer
Merge commit 'fe99c52fa99e44961a09cd1324aefd492b797fc8'
* commit 'fe99c52fa99e44961a09cd1324aefd492b797fc8':
mp3: Properly use AVCodecContext API
Conflicts:
libavformat/mp3dec.c
See: 6ad42b3e15478284321dd285acaf189a16590854
See: b851bc20c6931c084710e69f7eec30d8c1bdb68e
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2d37c57f3e9d58916b1247e0f335065415ce1364
---
More information about the ffmpeg-cvslog
mailing list