[FFmpeg-devel] [PATCH 1/6] avcodec/h264pred: deconflict DC_128_PRED and HOR_VP8_PRED

[Peter Ross]

Both are required by the VP7 decoder.

Signed-off-by: Peter Ross <pross at xvid.org>
---
 libavcodec/h264pred.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/h264pred.h b/libavcodec/h264pred.h
index ed67d2e..00af03a 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
-- 
1.8.3.2

-- Peter
(A907 E02F A6E5 0CD2 34CD 20D2 6760 79C5 AC40 DD6B)
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20140214/d777d348/attachment.asc>