[FFmpeg-cvslog] Merge commit 'b114f6d48a06a4dad6882bc83e07463905f004c4'
Michael Niedermayer
git at videolan.org
Sat Jun 27 20:29:51 CEST 2015
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Jun 27 19:21:25 2015 +0200| [a50b00822784f6b098eb634132ad75394f1d26c0] | committer: Michael Niedermayer
Merge commit 'b114f6d48a06a4dad6882bc83e07463905f004c4'
* commit 'b114f6d48a06a4dad6882bc83e07463905f004c4':
avconv: factor out flushing the filters
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a50b00822784f6b098eb634132ad75394f1d26c0
---
More information about the ffmpeg-cvslog
mailing list