diff options
author | Spec-Chum <spec-chum@users.sourceforge.net> | 2010-06-28 13:52:29 +0400 |
---|---|---|
committer | Spec-Chum <spec-chum@users.sourceforge.net> | 2010-06-28 13:52:29 +0400 |
commit | d689241854077b6efc7a62f0e4f5b3bd414228e6 (patch) | |
tree | 8bc1c3300a160572b01845c5cabf01f59424030a /src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264pred.h | |
parent | 4a0275d8a6340469646ef0e07fe8121875051ad0 (diff) |
Updated ffmpeg (patch by XhmikosR) - Unresolved externals fixed by Spec-Chum
git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@2082 10f7b99b-c216-0410-bff0-8a66a9350fd8
Diffstat (limited to 'src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264pred.h')
-rw-r--r-- | src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264pred.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264pred.h b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264pred.h index 9705d5144..9ac1fec8b 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264pred.h +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264pred.h @@ -20,7 +20,7 @@ */
/**
- * @file h264pred.h
+ * @file
* H.264 / AVC / MPEG4 prediction functions.
* @author Michael Niedermayer <michaelni@gmx.at>
*/
@@ -74,7 +74,7 @@ * Context for storing H.264 prediction functions
*/
typedef struct H264PredContext{
- void (*pred4x4 [9+3+3])(uint8_t *src, uint8_t *topright, int stride);//FIXME move to dsp?
+ void (*pred4x4 [9+3+3])(uint8_t *src, const 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+4])(uint8_t *src, int stride);
void (*pred16x16[4+3])(uint8_t *src, int stride);
@@ -86,5 +86,7 @@ typedef struct H264PredContext{ }H264PredContext;
void ff_h264_pred_init(H264PredContext *h, int codec_id);
+void ff_h264_pred_init_arm(H264PredContext *h, int codec_id);
+void ff_h264_pred_init_x86(H264PredContext *h, int codec_id);
#endif /* AVCODEC_H264PRED_H */
|