[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'
Michael Niedermayer
git at videolan.org
Mon May 6 10:56:33 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon May 6 10:47:49 2013 +0200| [5cb9093aa8488b9ab5146184e8483f11dd739863] | committer: Michael Niedermayer
Merge remote-tracking branch 'qatar/master'
* qatar/master:
wav: Always seek to an even offset
Conflicts:
libavformat/wavdec.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5cb9093aa8488b9ab5146184e8483f11dd739863
---
More information about the ffmpeg-cvslog
mailing list