Oma demuxer

[ffmpeg] / libavcodec / h264pred.h

diff --git a/libavcodec/h264pred.h b/libavcodec/h264pred.h
index 33839d1a07cb5fca72fbf87f4455f2a9c74098f1..4e3fcdfab4d81a9d83218a01f22b429baf7b8c39 100644 (file)
--- a/libavcodec/h264pred.h
+++ b/libavcodec/h264pred.h
@@ -28,7 +28,7 @@
 #ifndef FFMPEG_H264PRED_H
 #define FFMPEG_H264PRED_H
 
-#include "common.h"
+#include "libavutil/common.h"
 
 /**
  * Prediction types
@@ -50,6 +50,7 @@
 
 #define DIAG_DOWN_LEFT_PRED_RV40_NODOWN   12
 #define HOR_UP_PRED_RV40_NODOWN           13
+#define VERT_LEFT_PRED_RV40_NODOWN        14
 
 #define DC_PRED8x8            0
 #define HOR_PRED8x8           1
@@ -65,7 +66,7 @@
  * Context for storing H.264 prediction functions
  */
 typedef struct H264PredContext{
-    void (*pred4x4  [9+3+2])(uint8_t *src, uint8_t *topright, int stride);//FIXME move to dsp?
+    void (*pred4x4  [9+3+3])(uint8_t *src, uint8_t *topright, int stride);//FIXME move to dsp?
     void (*pred8x8l [9+3])(uint8_t *src, int topleft, int topright, int stride);
     void (*pred8x8  [4+3])(uint8_t *src, int stride);
     void (*pred16x16[4+3])(uint8_t *src, int stride);