ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Sat May 2 22:07:27 2015 +0200| [e874772f70908ad5b1754c0373a35bec08fad547] | committer: Michael Niedermayer
Merge commit '21180b73239c6360aa28496d4879713b7ba4a8e5' * commit '21180b73239c6360aa28496d4879713b7ba4a8e5': avplay: Factorize code for adding filters to the filter pipeline Conflicts: ffplay.c See: 08c51e12b1c3f3e3e68e33eb46be7131df5b3682 Merged-by: Michael Niedermayer <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e874772f70908ad5b1754c0373a35bec08fad547 --- _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog