[FFmpeg-cvslog] Merge commit 'f5fac6f77752931347ab302563802dcaa49c2419'
Michael Niedermayer
git at videolan.org
Sun Feb 10 13:17:24 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Feb 10 13:06:16 2013 +0100| [9a714d871ac5c7dc6d35aec56caca0c5ede68fba] | committer: Michael Niedermayer
Merge commit 'f5fac6f77752931347ab302563802dcaa49c2419'
* commit 'f5fac6f77752931347ab302563802dcaa49c2419':
asfdec: support reading ID3v2 tags in ASF files
Conflicts:
Changelog
libavformat/asfdec.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9a714d871ac5c7dc6d35aec56caca0c5ede68fba
---
More information about the ffmpeg-cvslog
mailing list