diff options
| author | Kostya Shishkov <kostya.shishkov@gmail.com> | 2007-09-05 05:30:08 +0000 |
|---|---|---|
| committer | Kostya Shishkov <kostya.shishkov@gmail.com> | 2007-09-05 05:30:08 +0000 |
| commit | c92a30bb061036def498e48e11d454a61e0f3b1f (patch) | |
| tree | cab763e2223c66b8ec61eaea881683aeafe64fbf /libavcodec/h264.h | |
| parent | 6a1aa752f0d732fac4ec68f71c4c871b2f823bf6 (diff) | |
| download | ffmpeg-c92a30bb061036def498e48e11d454a61e0f3b1f.tar.gz | |
Move H.264 intra prediction functions into their own context
Originally committed as revision 10397 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/h264.h')
| -rw-r--r-- | libavcodec/h264.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libavcodec/h264.h b/libavcodec/h264.h index b06fed576d..d06bb33a42 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -31,6 +31,7 @@ #include "dsputil.h" #include "cabac.h" #include "mpegvideo.h" +#include "h264pred.h" #define interlaced_dct interlaced_dct_is_a_bad_name #define mb_intra mb_intra_is_not_initialized_see_mb_type @@ -185,10 +186,7 @@ typedef struct H264Context{ int8_t intra4x4_pred_mode_cache[5*8]; int8_t (*intra4x4_pred_mode)[8]; - void (*pred4x4 [9+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); + H264PredContext hpc; unsigned int topleft_samples_available; unsigned int top_samples_available; unsigned int topright_samples_available; |