Commit 96e1cc3f authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'a5a6a786'

* commit 'a5a6a786':
  mp3: Forward seeking errors

Conflicts:
	libavformat/mp3dec.c

No change as the avio_seek() that are part of seeking in mp3 are already
checked in FFmpeg
Merged-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
parents 3edc6d1c a5a6a786
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