Commit ececbeda authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'c1868e7e'

* commit 'c1868e7e':
  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: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 9ace1541 c1868e7e
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment