diff options
| author | Luca Barbato <lu_zero@gentoo.org> | 2013-01-17 11:24:01 +0100 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2013-01-17 21:42:03 +0100 |
| commit | 21ca4ab9449f1165913fd971dc0eb7387b8fe5a8 (patch) | |
| tree | 97bdf66ed4ebe4818cf51b0c7754a7d87ec68692 | |
| parent | c749bec8c3ef88e3e12847a60d6e8e6d73c736d4 (diff) | |
| download | ffmpeg-21ca4ab9449f1165913fd971dc0eb7387b8fe5a8.tar.gz | |
libcdio: support recent cdio-paranoia
Upstream decided to split the paranoia interface and move the headers
accordingly.
(cherry picked from commit 57224e425c567a87798b66425acc383c6dd37331)
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| -rwxr-xr-x | configure | 7 | ||||
| -rw-r--r-- | libavdevice/libcdio.c | 7 |
2 files changed, 12 insertions, 2 deletions
@@ -1201,6 +1201,8 @@ HAVE_LIST=" asm_mod_y attribute_may_alias attribute_packed + cdio_paranoia_h + cdio_paranoia_paranoia_h closesocket cmov CommandLineToArgvW @@ -3551,8 +3553,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 <cdio/cdda.h> #include <cdio/paranoia.h> +#elif HAVE_CDIO_PARANOIA_PARANOIA_H +#include <cdio/paranoia/cdda.h> +#include <cdio/paranoia/paranoia.h> +#endif #include "libavutil/log.h" #include "libavutil/mem.h" |