diff options
| author | Peter Ross <pross@xvid.org> | 2014-02-14 22:57:43 +1100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-14 23:20:57 +0100 |
| commit | c55143179234dc552090bac6ec90c3b4edf4506f (patch) | |
| tree | a63da3f04f6d40527465c9d0d770dddad0656200 | |
| parent | f11905763cda57ea7d58cb7d522988988c086429 (diff) | |
| download | ffmpeg-c55143179234dc552090bac6ec90c3b4edf4506f.tar.gz | |
avcodec/h264pred: deconflict DC_128_PRED and HOR_VP8_PRED
Both are required by the VP7 decoder.
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/h264pred.h | 2 |
1 files changed, 1 insertions, 1 deletions
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 |