[FFmpeg-cvslog] h264: Try to fix 422 intra NEON

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Aug 24 17:57:40 2011 +0200| [565cabf5c80b25d86c2e539afcb3b24024fbce0a] | committer: Michael Niedermayer

h264: Try to fix 422 intra NEON

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=565cabf5c80b25d86c2e539afcb3b24024fbce0a
---

 libavcodec/arm/h264dsp_init_arm.c  |    3 ++-
 libavcodec/arm/h264pred_init_arm.c |    3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/libavcodec/arm/h264dsp_init_arm.c b/libavcodec/arm/h264dsp_init_arm.c
index e2c2265..e510268 100644
--- a/libavcodec/arm/h264dsp_init_arm.c
+++ b/libavcodec/arm/h264dsp_init_arm.c
@@ -97,9 +97,10 @@ static void ff_h264dsp_init_neon(H264DSPContext *c, const int bit_depth, const i
     if (bit_depth == 8) {
     c->h264_v_loop_filter_luma   = ff_h264_v_loop_filter_luma_neon;
     c->h264_h_loop_filter_luma   = ff_h264_h_loop_filter_luma_neon;
+    if(chroma_format_idc == 1){
     c->h264_v_loop_filter_chroma = ff_h264_v_loop_filter_chroma_neon;
     c->h264_h_loop_filter_chroma = ff_h264_h_loop_filter_chroma_neon;
-
+    }
     c->weight_h264_pixels_tab[0] = ff_weight_h264_pixels_16x16_neon;
     c->weight_h264_pixels_tab[1] = ff_weight_h264_pixels_16x8_neon;
     c->weight_h264_pixels_tab[2] = ff_weight_h264_pixels_8x16_neon;
diff --git a/libavcodec/arm/h264pred_init_arm.c b/libavcodec/arm/h264pred_init_arm.c
index 4c5758d..75653ff 100644
--- a/libavcodec/arm/h264pred_init_arm.c
+++ b/libavcodec/arm/h264pred_init_arm.c
@@ -48,7 +48,7 @@ static void ff_h264_pred_init_neon(H264PredContext *h, int codec_id, const int b
 
     if (high_depth)
         return;
-
+    if(chroma_format_idc == 1){
     h->pred8x8[VERT_PRED8x8     ] = ff_pred8x8_vert_neon;
     h->pred8x8[HOR_PRED8x8      ] = ff_pred8x8_hor_neon;
     if (codec_id != CODEC_ID_VP8)
@@ -63,6 +63,7 @@ static void ff_h264_pred_init_neon(H264PredContext *h, int codec_id, const int b
         h->pred8x8[ALZHEIMER_DC_L00_PRED8x8] = ff_pred8x8_l00_dc_neon;
         h->pred8x8[ALZHEIMER_DC_0L0_PRED8x8] = ff_pred8x8_0l0_dc_neon;
     }
+    }
 
     h->pred16x16[DC_PRED8x8     ] = ff_pred16x16_dc_neon;
     h->pred16x16[VERT_PRED8x8   ] = ff_pred16x16_vert_neon;