[FFmpeg-cvslog] Merge commit '79922d7237aba2b8c6abbd2e06a0c08e4f498ad4'
Michael Niedermayer
git at videolan.org
Wed Oct 17 15:52:39 CEST 2012
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Oct 17 15:50:45 2012 +0200| [940ee636301aa73a38e5b3fa025f43901008538b] | committer: Michael Niedermayer
Merge commit '79922d7237aba2b8c6abbd2e06a0c08e4f498ad4'
* commit '79922d7237aba2b8c6abbd2e06a0c08e4f498ad4':
wav: do not fail on empty INFO tags
Conflicts:
libavformat/wavdec.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=940ee636301aa73a38e5b3fa025f43901008538b
---
More information about the ffmpeg-cvslog
mailing list