Remove unreachable else clause, found by dark shikari.

[ffmpeg] / libavcodec / vc1.h

diff --git a/libavcodec/vc1.h b/libavcodec/vc1.h
index 3e92d6c340ee2f2b27e2af92730d557f4734be28..4cd7bb1912e0d7663518018d0f2d518a2156cf35 100644 (file)
--- a/libavcodec/vc1.h
+++ b/libavcodec/vc1.h
@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_VC1_H
-#define FFMPEG_VC1_H
+#ifndef AVCODEC_VC1_H
+#define AVCODEC_VC1_H
 
 #include "avcodec.h"
 #include "mpegvideo.h"
@@ -127,9 +127,6 @@ enum TransformTypes {
 };
 //@}
 
-/** One more frame type */
-#define BI_TYPE FF_BI_TYPE
-
 enum CodingSet {
     CS_HIGH_MOT_INTRA = 0,
     CS_HIGH_MOT_INTER,
@@ -307,6 +304,8 @@ typedef struct VC1Context{
     int p_frame_skipped;
     int bi_type;
     int x8_type;
+
+    uint32_t *cbp_base, *cbp;
 } VC1Context;
 
-#endif /* FFMPEG_VC1_H */
+#endif /* AVCODEC_VC1_H */