virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
Code Issues Releases Activity

libcdio: support recent cdio-paranoia

Browse Source 
Upstream decided to split the paranoia interface and move the headers
accordingly.
This commit is contained in:
Luca Barbato 2013-01-17 11:24:01 +01:00
parent 973b4d44f1
commit 43e0e0c4e5
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
configure vendored
View File

@ -1199,6 +1199,8 @@ HAVE_LIST="
asm_mod_y asm_mod_y
attribute_may_alias attribute_may_alias
attribute_packed attribute_packed
cdio_paranoia_h
cdio_paranoia_paranoia_h
closesocket closesocket
cmov cmov
CommandLineToArgvW 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_any sndio_indev sndio_outdev && check_lib2 sndio.h sio_open -lsndio
enabled libcdio && if enabled libcdio; then
check_lib2 "cdio/cdda.h cdio/paranoia.h" cdio_cddap_open -lcdio_paranoia -lcdio_cdda -lcdio 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 && enabled x11grab &&
require X11 X11/Xlib.h XOpenDisplay -lX11 && require X11 X11/Xlib.h XOpenDisplay -lX11 &&

7
libavdevice/libcdio.c
View File

@ -23,8 +23,15 @@
* libcdio CD grabbing * libcdio CD grabbing
*/ */
#include "config.h"
#if HAVE_CDIO_PARANOIA_H
#include <cdio/cdda.h> #include <cdio/cdda.h>
#include <cdio/paranoia.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/log.h"
#include "libavutil/mem.h" #include "libavutil/mem.h"