Merge commit 'a5a6a786bfebb85c269abc25559fd71963983581'
authorMichael Niedermayer <michael@niedermayer.cc>
Mon, 13 Jul 2015 23:46:16 +0000 (01:46 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Mon, 13 Jul 2015 23:46:16 +0000 (01:46 +0200)
commit96e1cc3f8b6b0b5b19820609b23642bde1ee7e7c
tree8ae6d7a413a3702a4c3953e2e7cec25c81c61def
parent3edc6d1cd9ef23e809a8d814dbfb589e7e1f57fe
parenta5a6a786bfebb85c269abc25559fd71963983581
Merge commit 'a5a6a786bfebb85c269abc25559fd71963983581'

* commit 'a5a6a786bfebb85c269abc25559fd71963983581':
  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: Michael Niedermayer <michael@niedermayer.cc>