diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-18 13:36:39 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-18 13:36:39 +0100 |
| commit | 17596198cacbb7277f1d9641f0a76fe62ebf155d (patch) | |
| tree | 1c35aa3df1c1b2b92f942b5f83b3f80ea42d0ad5 /libavdevice/libcdio.c | |
| parent | a003c5bd4ff1846edba0518306f8091c14041c96 (diff) | |
| parent | 80ac87c13dc8c6c063e26a464c5c542357c0583f (diff) | |
Merge commit '80ac87c13dc8c6c063e26a464c5c542357c0583f'
* commit '80ac87c13dc8c6c063e26a464c5c542357c0583f':
lavc: support ZenoXVID custom tag
libcdio: support recent cdio-paranoia
float_dsp: Add #ifdef HAVE_INLINE_ASM around vector_fmul_window
theora: Skip zero-sized headers
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/libcdio.c')
| -rw-r--r-- | libavdevice/libcdio.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/libavdevice/libcdio.c b/libavdevice/libcdio.c index ec53e2c072..a824bc3882 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" |