diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-31 14:29:11 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-31 14:29:15 +0100 |
| commit | 958836f8c5197ee32133a0ca7d35bcbb50358379 (patch) | |
| tree | bdded432bc63541372b2323e92c52397940b36dd /libavcodec | |
| parent | b47ab04c40ab771bc8e96a0756821515cc2fbac4 (diff) | |
| parent | f9f9ae1b77e4fb1bffa6b23be7bd20e514b8ba7b (diff) | |
| download | ffmpeg-958836f8c5197ee32133a0ca7d35bcbb50358379.tar.gz | |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
lavc/arm: Use the neon vertical chroma loop filter also for H.264 4:2:2.
lavc/aarch64: Do not use the neon horizontal chroma loop filter for H.264 4:2:2.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/aarch64/h264dsp_init_aarch64.c | 1 | ||||
| -rw-r--r-- | libavcodec/arm/h264dsp_init_arm.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/aarch64/h264dsp_init_aarch64.c b/libavcodec/aarch64/h264dsp_init_aarch64.c index ed5e4bdd9b..e0f378f5ab 100644 --- a/libavcodec/aarch64/h264dsp_init_aarch64.c +++ b/libavcodec/aarch64/h264dsp_init_aarch64.c @@ -78,6 +78,7 @@ av_cold void ff_h264dsp_init_aarch64(H264DSPContext *c, const int bit_depth, 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; c->h264_v_loop_filter_chroma = ff_h264_v_loop_filter_chroma_neon; + if (chroma_format_idc <= 1) c->h264_h_loop_filter_chroma = ff_h264_h_loop_filter_chroma_neon; c->weight_h264_pixels_tab[0] = ff_weight_h264_pixels_16_neon; diff --git a/libavcodec/arm/h264dsp_init_arm.c b/libavcodec/arm/h264dsp_init_arm.c index 88dfd7580b..90144d0da2 100644 --- a/libavcodec/arm/h264dsp_init_arm.c +++ b/libavcodec/arm/h264dsp_init_arm.c @@ -76,8 +76,8 @@ static av_cold void h264dsp_init_neon(H264DSPContext *c, const int bit_depth, 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; + if(chroma_format_idc == 1){ c->h264_h_loop_filter_chroma = ff_h264_h_loop_filter_chroma_neon; } |