[FFmpeg-cvslog] Merge commit 'a7d45e06e9757f49ea4e105cbefc3462a7324e9a'
Michael Niedermayer
git at videolan.org
Tue Aug 6 19:26:14 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Aug 6 19:21:29 2013 +0200| [05f1b4e2ecc4683467669a190e3a53df413de805] | committer: Michael Niedermayer
Merge commit 'a7d45e06e9757f49ea4e105cbefc3462a7324e9a'
* commit 'a7d45e06e9757f49ea4e105cbefc3462a7324e9a':
configure: The W64 demuxer should select the WAV demuxer, not depend on it
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=05f1b4e2ecc4683467669a190e3a53df413de805
---
More information about the ffmpeg-cvslog
mailing list