Merge commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967'

[ffmpeg] / libavdevice / libcdio.c

diff --git a/libavdevice/libcdio.c b/libavdevice/libcdio.c
index fa311fd657d2eb06ffe95111cdf516cf8d21bed2..ec53e2c0729f5fc3ed36bc170cd582ff8d62acff 100644 (file)
--- a/libavdevice/libcdio.c
+++ b/libavdevice/libcdio.c
@@ -33,9 +33,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 {
     const AVClass       *class;
     cdrom_drive_t       *drive;