[FFmpeg-cvslog] Merge commit '3799376dd3373ee255651ed542c75b15665801a8'
Michael Niedermayer
git at videolan.org
Tue Aug 6 09:40:23 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Aug 6 09:35:03 2013 +0200| [bb5ef961647f06425eff236d9575db0ab6ae66f1] | committer: Michael Niedermayer
Merge commit '3799376dd3373ee255651ed542c75b15665801a8'
* commit '3799376dd3373ee255651ed542c75b15665801a8':
lavfi/fifo: fix flushing when using request_samples
Conflicts:
libavfilter/fifo.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bb5ef961647f06425eff236d9575db0ab6ae66f1
---
More information about the ffmpeg-cvslog
mailing list