[FFmpeg-cvslog] Merge commit 'a5a6a786bfebb85c269abc25559fd71963983581'
Michael Niedermayer
git at videolan.org
Tue Jul 14 02:00:16 CEST 2015
ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Tue Jul 14 01:46:16 2015 +0200| [96e1cc3f8b6b0b5b19820609b23642bde1ee7e7c] | committer: Michael Niedermayer
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 at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=96e1cc3f8b6b0b5b19820609b23642bde1ee7e7c
---
More information about the ffmpeg-cvslog
mailing list