From c55143179234dc552090bac6ec90c3b4edf4506f Mon Sep 17 00:00:00 2001 From: Peter Ross Date: Fri, 14 Feb 2014 22:57:43 +1100 Subject: avcodec/h264pred: deconflict DC_128_PRED and HOR_VP8_PRED Both are required by the VP7 decoder. Signed-off-by: Peter Ross Signed-off-by: Michael Niedermayer --- libavcodec/h264pred.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libavcodec/h264pred.h') diff --git a/libavcodec/h264pred.h b/libavcodec/h264pred.h index ed67d2ef43..00af03a568 100644 --- a/libavcodec/h264pred.h +++ b/libavcodec/h264pred.h @@ -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 -- cgit v1.2.3