Remove unreachable else clause, found by dark shikari.

[ffmpeg] / libavcodec / vc1.h

diff --git a/libavcodec/vc1.h b/libavcodec/vc1.h
index aa61dfaa8cb8630bad2477e295382108866dbd0e..4cd7bb1912e0d7663518018d0f2d518a2156cf35 100644 (file)
--- a/libavcodec/vc1.h
+++ b/libavcodec/vc1.h
@@ -25,6 +25,7 @@
 
 #include "avcodec.h"
 #include "mpegvideo.h"
+#include "intrax8.h"
 
 /** Markers used in VC-1 AP frame data */
 //@{
@@ -126,9 +127,6 @@ enum TransformTypes {
 };
 //@}
 
-/** One more frame type */
-#define BI_TYPE 7
-
 enum CodingSet {
     CS_HIGH_MOT_INTRA = 0,
     CS_HIGH_MOT_INTER,
@@ -156,6 +154,7 @@ enum COTypes {
  */
 typedef struct VC1Context{
     MpegEncContext s;
+    IntraX8Context x8;
 
     int bits;
 
@@ -214,6 +213,8 @@ typedef struct VC1Context{
     int k_y;              ///< Number of bits for MVs (depends on MV range)
     int range_x, range_y; ///< MV range
     uint8_t pq, altpq;    ///< Current/alternate frame quantizer scale
+    const uint8_t* zz_8x4;///< Zigzag scan table for TT_8x4 coding mode
+    const uint8_t* zz_4x8;///< Zigzag scan table for TT_4x8 coding mode
     /** pquant parameters */
     //@{
     uint8_t dquantfrm;
@@ -302,6 +303,9 @@ typedef struct VC1Context{
 
     int p_frame_skipped;
     int bi_type;
+    int x8_type;
+
+    uint32_t *cbp_base, *cbp;
 } VC1Context;
 
-#endif // AVCODEC_VC1_H
+#endif /* AVCODEC_VC1_H */