diff options
| author | David Conrad <lessen42@gmail.com> | 2010-06-22 19:17:09 +0000 |
|---|---|---|
| committer | Ronald S. Bultje <rsbultje@gmail.com> | 2010-06-22 19:17:09 +0000 |
| commit | 3ad289fca73f97940c4e3750557299ab5683165e (patch) | |
| tree | b48af8b100ded44be98ce0dc37a8287404a16b8c /libavcodec/arm/h264pred_init_arm.c | |
| parent | b39a2d19d4d59d21ae1d0413e0e9ca0e08f2d1e9 (diff) | |
| download | ffmpeg-3ad289fca73f97940c4e3750557299ab5683165e.tar.gz | |
Add intra prediction functions for VP8.
Patch by David Conrad <lessen42 gmail com> and myself.
Originally committed as revision 23716 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/arm/h264pred_init_arm.c')
| -rw-r--r-- | libavcodec/arm/h264pred_init_arm.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/arm/h264pred_init_arm.c b/libavcodec/arm/h264pred_init_arm.c index a56759a8cf..51dec649bc 100644 --- a/libavcodec/arm/h264pred_init_arm.c +++ b/libavcodec/arm/h264pred_init_arm.c @@ -46,9 +46,10 @@ static void ff_h264_pred_init_neon(H264PredContext *h, int codec_id) { h->pred8x8[VERT_PRED8x8 ] = ff_pred8x8_vert_neon; h->pred8x8[HOR_PRED8x8 ] = ff_pred8x8_hor_neon; + if (codec_id != CODEC_ID_VP8) h->pred8x8[PLANE_PRED8x8 ] = ff_pred8x8_plane_neon; h->pred8x8[DC_128_PRED8x8 ] = ff_pred8x8_128_dc_neon; - if (codec_id != CODEC_ID_RV40) { + if (codec_id != CODEC_ID_RV40 && codec_id != CODEC_ID_VP8) { h->pred8x8[DC_PRED8x8 ] = ff_pred8x8_dc_neon; h->pred8x8[LEFT_DC_PRED8x8] = ff_pred8x8_left_dc_neon; h->pred8x8[TOP_DC_PRED8x8 ] = ff_pred8x8_top_dc_neon; @@ -64,7 +65,7 @@ static void ff_h264_pred_init_neon(H264PredContext *h, int codec_id) h->pred16x16[LEFT_DC_PRED8x8] = ff_pred16x16_left_dc_neon; h->pred16x16[TOP_DC_PRED8x8 ] = ff_pred16x16_top_dc_neon; h->pred16x16[DC_128_PRED8x8 ] = ff_pred16x16_128_dc_neon; - if (codec_id != CODEC_ID_SVQ3 && codec_id != CODEC_ID_RV40) + if (codec_id != CODEC_ID_SVQ3 && codec_id != CODEC_ID_RV40 && codec_id != CODEC_ID_VP8) h->pred16x16[PLANE_PRED8x8 ] = ff_pred16x16_plane_neon; } |