Remove redundant checks against MIN_CACHE_BITS

[ffmpeg] / libavcodec / dvdsubdec.c

diff --git a/libavcodec/dvdsubdec.c b/libavcodec/dvdsubdec.c
index 75b52566d3e5383c27b20a4714d055069a5fef36..ea7467fdf5daef98cd152fe55963883061ae401a 100644 (file)
--- a/libavcodec/dvdsubdec.c
+++ b/libavcodec/dvdsubdec.c
@@ -20,8 +20,8 @@
  */
 #include "avcodec.h"
 #include "get_bits.h"
-#include "colorspace.h"
 #include "dsputil.h"
+#include "libavutil/colorspace.h"
 
 //#define DEBUG
 
@@ -460,7 +460,7 @@ static int dvdsub_decode(AVCodecContext *avctx,
 {
     const uint8_t *buf = avpkt->data;
     int buf_size = avpkt->size;
-    AVSubtitle *sub = (void *)data;
+    AVSubtitle *sub = data;
     int is_menu;
 
     is_menu = decode_dvd_subtitles(sub, buf, buf_size);