diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-03 01:37:12 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-03 01:37:45 +0200 |
| commit | 97a5b4ba53a10aa8c5ecf2ccf18c61e6724bebd3 (patch) | |
| tree | de1fb47b6176dbcdd2b13383aa6c39907d20a0a1 /libavcodec/arm/h264dsp_init_arm.c | |
| parent | f2275400fe52cd0a58e532a2d048c094a5074068 (diff) | |
| parent | 0f71a5df4bc913f17a53c7ac66d4957914fa1d3d (diff) | |
| download | ffmpeg-97a5b4ba53a10aa8c5ecf2ccf18c61e6724bebd3.tar.gz | |
Merge commit '0f71a5df4bc913f17a53c7ac66d4957914fa1d3d' into release/0.10
* commit '0f71a5df4bc913f17a53c7ac66d4957914fa1d3d':
h264: do not use 422 functions for monochrome
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/arm/h264dsp_init_arm.c')
| -rw-r--r-- | libavcodec/arm/h264dsp_init_arm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/arm/h264dsp_init_arm.c b/libavcodec/arm/h264dsp_init_arm.c index cc4c688c8b..94dfc52b93 100644 --- a/libavcodec/arm/h264dsp_init_arm.c +++ b/libavcodec/arm/h264dsp_init_arm.c @@ -89,7 +89,7 @@ static void ff_h264dsp_init_neon(H264DSPContext *c, const int bit_depth, const i c->h264_idct_dc_add = ff_h264_idct_dc_add_neon; c->h264_idct_add16 = ff_h264_idct_add16_neon; c->h264_idct_add16intra = ff_h264_idct_add16intra_neon; - if (chroma_format_idc == 1) + if (chroma_format_idc <= 1) c->h264_idct_add8 = ff_h264_idct_add8_neon; c->h264_idct8_add = ff_h264_idct8_add_neon; c->h264_idct8_dc_add = ff_h264_idct8_dc_add_neon; |