From: Luca Barbato Date: Thu, 17 Jan 2013 10:24:01 +0000 (+0100) Subject: libcdio: support recent cdio-paranoia X-Git-Tag: n1.2~21^2~424 X-Git-Url: http://git.videolan.org/?p=ffmpeg.git;a=commitdiff_plain;h=43e0e0c4e56d754988f6d2d7eec1c302cee5d5ec libcdio: support recent cdio-paranoia Upstream decided to split the paranoia interface and move the headers accordingly. --- diff --git a/configure b/configure index 879c36d178..f7350b38fd 100755 --- a/configure +++ b/configure @@ -1199,6 +1199,8 @@ HAVE_LIST=" asm_mod_y attribute_may_alias attribute_packed + cdio_paranoia_h + cdio_paranoia_paranoia_h closesocket cmov CommandLineToArgvW @@ -3558,8 +3560,9 @@ enabled jack_indev && check_lib2 jack/jack.h jack_client_open -ljack && enabled_any sndio_indev sndio_outdev && check_lib2 sndio.h sio_open -lsndio -enabled libcdio && - check_lib2 "cdio/cdda.h cdio/paranoia.h" cdio_cddap_open -lcdio_paranoia -lcdio_cdda -lcdio +if enabled libcdio; then + check_lib2 "cdio/cdda.h cdio/paranoia.h" cdio_cddap_open -lcdio_paranoia -lcdio_cdda -lcdio || check_lib2 "cdio/paranoia/cdda.h cdio/paranoia/paranoia.h" cdio_cddap_open -lcdio_paranoia -lcdio_cdda -lcdio +fi enabled x11grab && require X11 X11/Xlib.h XOpenDisplay -lX11 && diff --git a/libavdevice/libcdio.c b/libavdevice/libcdio.c index e846ee635b..06ddb4a784 100644 --- a/libavdevice/libcdio.c +++ b/libavdevice/libcdio.c @@ -23,8 +23,15 @@ * libcdio CD grabbing */ +#include "config.h" + +#if HAVE_CDIO_PARANOIA_H #include #include +#elif HAVE_CDIO_PARANOIA_PARANOIA_H +#include +#include +#endif #include "libavutil/log.h" #include "libavutil/mem.h"