[FFmpeg-cvslog] Merge commit 'c1d647b15afa69fa70f999a9ddcb98346409fb4d'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Sun Jul 12 15:55:17 2015 +0200| [7da1f00e79eb2f04922a8c09d986fed178a386fe] | committer: Michael Niedermayer

Merge commit 'c1d647b15afa69fa70f999a9ddcb98346409fb4d'

* commit 'c1d647b15afa69fa70f999a9ddcb98346409fb4d':
  mp3: Make the seek more robust

Conflicts:
	libavformat/mp3dec.c

Mostly not merged

See: b6267901c466c482b2f1af3578b0a6d88265d144 and various later commits

The bug is also not reproducable in FFmpeg

Merged-by: Michael Niedermayer <michael at niedermayer.cc>

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