Merge commit '8575f5362f98c937758b20ff8512d6767a56208e' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 4 Feb 2014 04:17:38 +0000 (05:17 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 4 Feb 2014 04:17:57 +0000 (05:17 +0100)
commit35bf91c5b55b43f699138c74618afc1f7815ee1c
treef18de050f8b6aefa4f91f789696edad430dd9eb0
parentc06f8bac204a2c8274533f183ad61d2a985f693d
parent8575f5362f98c937758b20ff8512d6767a56208e
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@gmx.at>
libavformat/utils.c