[FFmpeg-cvslog] Merge commit '505642f18276aed03278ac91b1f334ea888eac6a'
Michael Niedermayer
git at videolan.org
Fri Apr 19 21:41:33 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Apr 19 21:30:39 2013 +0200| [194d0399a29cedd9726e4a4b791ca959a7e71e45] | committer: Michael Niedermayer
Merge commit '505642f18276aed03278ac91b1f334ea888eac6a'
* commit '505642f18276aed03278ac91b1f334ea888eac6a':
mp3dec: fallback to generic seeking when a TOC is not present
Conflicts:
libavformat/mp3dec.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=194d0399a29cedd9726e4a4b791ca959a7e71e45
---
More information about the ffmpeg-cvslog
mailing list