h264: reset ref count if decoding the slice header fails

[ffmpeg] / libavdevice / libcdio.c

diff --git a/libavdevice/libcdio.c b/libavdevice/libcdio.c
index a82ad67f34c228a6d6fd9655de7346eae61e7816..06ddb4a7846c16f594ef31a3198b15d2ea453f02 100644 (file)
--- 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"
@@ -33,9 +40,6 @@
 #include "libavformat/avformat.h"
 #include "libavformat/internal.h"
 
-/* cdio returns some malloced strings that need to be free()d */
-#undef free
-
 typedef struct CDIOContext {
     AVClass             *class;
     cdrom_drive_t       *drive;