[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'
Michael Niedermayer
git at videolan.org
Sun Aug 21 15:31:23 CEST 2011
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Aug 21 15:27:02 2011 +0200| [ff96098084542c3ef98b360f70583999433d13a7] | committer: Michael Niedermayer
Merge remote-tracking branch 'qatar/master'
* qatar/master:
WavPack demuxer: do not rely on index when timestamp is not in indexed range.
WavPack demuxer: store position of the first block in index.
WavPack decoder: implement flush function
avconv: Separate initialization from the main transcode loop.
Conflicts:
avconv.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ff96098084542c3ef98b360f70583999433d13a7
---
More information about the ffmpeg-cvslog
mailing list