diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-06 16:45:52 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-06 16:51:23 +0100 |
| commit | 30056fd0be8ace0754e0568787bb4c18ea49edeb (patch) | |
| tree | 2fc504571e70381b06b8ab26a20eb0ad1375c7b5 /libavcodec/arm/h264dsp_init_arm.c | |
| parent | 64591f8f86f2dfeac13ee6b4e971d069675ca814 (diff) | |
| parent | a03a642d5ceb5f2f7c6ebbf56ff365dfbcdb65eb (diff) | |
| download | ffmpeg-streaming-30056fd0be8ace0754e0568787bb4c18ea49edeb.zip ffmpeg-streaming-30056fd0be8ace0754e0568787bb4c18ea49edeb.tar.gz | |
Merge commit 'a03a642d5ceb5f2f7c6ebbf56ff365dfbcdb65eb'
* commit 'a03a642d5ceb5f2f7c6ebbf56ff365dfbcdb65eb':
h264: do not use 422 functions for monochrome
See: 07abf13da4a7c3d23ce6bc6542d72e6252161736
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 2cafbaf..cbf3ffe 100644 --- a/libavcodec/arm/h264dsp_init_arm.c +++ b/libavcodec/arm/h264dsp_init_arm.c @@ -94,7 +94,7 @@ static av_cold void h264dsp_init_neon(H264DSPContext *c, const int bit_depth, 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; |
