Michael Niedermayer c1c836d9eb 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@gmx.at>

2011-11-16 02:27:31 +01:00

3.4 KiB

Raw Blame History

View Raw