[FFmpeg-cvslog] Merge commit 'fbd8e042107ec63e0ddf155588c59dcb76007641'
Michael Niedermayer
git at videolan.org
Thu Apr 17 22:34:26 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Apr 17 22:07:45 2014 +0200| [39edcadc07e90c551596e74a932b603eea0c8b01] | committer: Michael Niedermayer
Merge commit 'fbd8e042107ec63e0ddf155588c59dcb76007641'
* commit 'fbd8e042107ec63e0ddf155588c59dcb76007641':
mp3dec: move XING/Info and VBRI parsing into their own functions
Conflicts:
libavformat/mp3dec.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=39edcadc07e90c551596e74a932b603eea0c8b01
---
More information about the ffmpeg-cvslog
mailing list