[FFmpeg-cvslog] Merge commit '91ac403b1316d59b4f43c4ea0f237e24cec2819a'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Dec  9 13:56:46 2012 +0100| [e7d924da30f0bd3cb680f45246526d312d2d2d6f] | committer: Michael Niedermayer

Merge commit '91ac403b1316d59b4f43c4ea0f237e24cec2819a'

* 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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e7d924da30f0bd3cb680f45246526d312d2d2d6f
---