diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-11-16 02:23:10 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-11-16 02:27:31 +0100 |
| commit | c1c836d9eb4f790146eb2aca24260982587f00ed (patch) | |
| tree | f7e4332b449a01dd2df9683b76523253d85e26f0 /libswscale | |
| parent | cd6851c5ef281e44af7028e08597c4dfb73d880f (diff) | |
| parent | 52767d891c665ab1124fe4ce82d99b59673de7d2 (diff) | |
| download | ffmpeg-c1c836d9eb4f790146eb2aca24260982587f00ed.tar.gz | |
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>
Diffstat (limited to 'libswscale')
0 files changed, 0 insertions, 0 deletions