Merge commit 'a5a6a786bfebb85c269abc25559fd71963983581'

Browse Source

* 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>

...

This commit is contained in:

Michael Niedermayer

2015-07-14 01:46:16 +02:00

parent 3edc6d1cd9 a5a6a786bf

commit 96e1cc3f8b

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available