ffmpeg | branch: release/2.4 | Michael Niedermayer <michae...@gmx.at> | Mon Mar 9 00:44:07 2015 +0100| [1f44b09d58d96ae98e91755cd3db2689e1deaf15] | committer: Michael Niedermayer
Merge commit '4070e02dfcf8c7d871b4a41d8b591ec0c130c70a' into release/2.4 * commit '4070e02dfcf8c7d871b4a41d8b591ec0c130c70a': configure: Properly fail when libcdio/cdparanoia is not found Conflicts: configure See: f514b5dff769a331ea2153c23594d9b29b667141 Merged-by: Michael Niedermayer <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1f44b09d58d96ae98e91755cd3db2689e1deaf15 --- _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog