[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'
Michael Niedermayer
git at videolan.org
Wed Nov 16 02:40:42 CET 2011
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Nov 16 02:23:10 2011 +0100| [c1c836d9eb4f790146eb2aca24260982587f00ed] | committer: Michael Niedermayer
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavf: fix multiplication overflow in avformat_find_stream_info()
cosmetics: indentation
mpegaudiodec: init static tables in AVCodec.init_static_data()
Conflicts:
libavcodec/mpegaudiodec.c
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c1c836d9eb4f790146eb2aca24260982587f00ed
---
More information about the ffmpeg-cvslog
mailing list