[FFmpeg-cvslog] avcodec/h264pred: deconflict DC_128_PRED and HOR_VP8_PRED

[Peter Ross]

ffmpeg | branch: master | Peter Ross <pross at xvid.org> | Fri Feb 14 22:57:43 2014 +1100| [c55143179234dc552090bac6ec90c3b4edf4506f] | committer: Michael Niedermayer

avcodec/h264pred: deconflict DC_128_PRED and HOR_VP8_PRED

Both are required by the VP7 decoder.

Signed-off-by: Peter Ross <pross at xvid.org>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c55143179234dc552090bac6ec90c3b4edf4506f
---

 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