[FFmpeg-cvslog] Merge commit '8575f5362f98c937758b20ff8512d6767a56208e' into release/1.1

[Michael Niedermayer]

ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Tue Feb  4 05:17:38 2014 +0100| [35bf91c5b55b43f699138c74618afc1f7815ee1c] | committer: Michael Niedermayer

Merge commit '8575f5362f98c937758b20ff8512d6767a56208e' into release/1.1

* commit '8575f5362f98c937758b20ff8512d6767a56208e':
  lavf: make av_probe_input_buffer more robust
  lavf: use a fixed width type
  lavf: simplify handling of offset in av_probe_input_buffer()

Conflicts:
	libavformat/utils.c

See: cdce0e8a506cafebe47736d891f5b645b57d14b2 and previous commits
Merged-by: Michael Niedermayer <michaelni at gmx.at>

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