ffmpeg | branch: release/2.2 | Michael Niedermayer <michae...@gmx.at> | Mon Mar 
 9 12:48:48 2015 +0100| [4e6f1df657224d560691246cee4d596e8760fa9d] | committer: 
Michael Niedermayer

Merge commit '0ad8d751337efbbd61c0d78762448b043100b653' into release/2.2

* commit '0ad8d751337efbbd61c0d78762448b043100b653':
  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=4e6f1df657224d560691246cee4d596e8760fa9d
---



_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

Reply via email to