[FFmpeg-cvslog] Merge commit 'c1868e7ee7b07b40a0fe15f50df89fe499a01a50'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jan 13 21:18:39 2014 +0100| [ececbedaa86cddd883f6cdc12cdd1a75a0023550] | committer: Michael Niedermayer

Merge commit 'c1868e7ee7b07b40a0fe15f50df89fe499a01a50'

* commit 'c1868e7ee7b07b40a0fe15f50df89fe499a01a50':
  lavf: simplify handling of offset in av_probe_input_buuffer()

Conflicts:
	libavformat/utils.c

The simplification is broken and does not work at least for ffmpeg,
thus this change is not merged.

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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