Merge commit '91ac403b1316d59b4f43c4ea0f237e24cec2819a'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 9 Dec 2012 12:56:46 +0000 (13:56 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 9 Dec 2012 12:56:46 +0000 (13:56 +0100)
* commit '91ac403b1316d59b4f43c4ea0f237e24cec2819a':
  lavf: fix arithmetic overflows in avformat_seek_file()
  mjpeg: initialize input padding after unescaped buffer to zero

Conflicts:
libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/mjpegdec.c

Simple merge