xsubdec: Convert to the new bitstream reader

[ffmpeg] / libavcodec / cinepak.c

diff --git a/libavcodec/cinepak.c b/libavcodec/cinepak.c
index caf14cbfcf536fa6255e0755e846d07a7cdc399c..611ffe5acd2d6a619b5d13ebd2526d50e9fa13e5 100644 (file)
--- a/libavcodec/cinepak.c
+++ b/libavcodec/cinepak.c
@@ -1,6 +1,6 @@
 /*
  * Cinepak Video Decoder
- * Copyright (C) 2003 the ffmpeg project
+ * Copyright (C) 2003 The FFmpeg project
  *
  * This file is part of Libav.
  *
@@ -40,14 +40,14 @@
 #include "internal.h"
 
 
-typedef struct {
+typedef struct cvid_codebook {
     uint8_t  y0, y1, y2, y3;
     uint8_t  u, v;
 } cvid_codebook;
 
 #define MAX_STRIPS      32
 
-typedef struct {
+typedef struct cvid_strip {
     uint16_t          id;
     uint16_t          x1, y1;
     uint16_t          x2, y2;
@@ -477,5 +477,5 @@ AVCodec ff_cinepak_decoder = {
     .init           = cinepak_decode_init,
     .close          = cinepak_decode_end,
     .decode         = cinepak_decode_frame,
-    .capabilities   = CODEC_CAP_DR1,
+    .capabilities   = AV_CODEC_CAP_DR1,
 };