avcodec/h264pred: deconflict DC_128_PRED and HOR_VP8_PRED
authorPeter Ross <pross@xvid.org>
Fri, 14 Feb 2014 11:57:43 +0000 (22:57 +1100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 14 Feb 2014 22:20:57 +0000 (23:20 +0100)
Both are required by the VP7 decoder.

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/h264pred.h

index ed67d2e..00af03a 100644 (file)
@@ -60,7 +60,7 @@
 #define VERT_VP8_PRED         10    ///< for VP8, #VERT_PRED is the average of
                                     ///< (left col+cur col x2+right col) / 4;
                                     ///< this is the "unaveraged" one
-#define HOR_VP8_PRED          11    ///< unaveraged version of #HOR_PRED, see
+#define HOR_VP8_PRED          14    ///< unaveraged version of #HOR_PRED, see
                                     ///< #VERT_VP8_PRED for details
 #define DC_127_PRED           12
 #define DC_129_PRED           13