mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
h264: avoid a grayscale related if() in hl_decode_mb()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
parent
507956824c
commit
07abf13da4
@ -159,10 +159,8 @@ static av_noinline void FUNC(hl_decode_mb)(H264Context *h)
|
||||
uvlinesize, 1, 0, SIMPLE, PIXEL_SHIFT);
|
||||
|
||||
if (SIMPLE || !CONFIG_GRAY || !(s->flags & CODEC_FLAG_GRAY)) {
|
||||
if (CHROMA) {
|
||||
h->hpc.pred8x8[h->chroma_pred_mode](dest_cb, uvlinesize);
|
||||
h->hpc.pred8x8[h->chroma_pred_mode](dest_cr, uvlinesize);
|
||||
}
|
||||
}
|
||||
|
||||
hl_decode_mb_predict_luma(h, mb_type, is_h264, SIMPLE,
|
||||
|
@ -406,7 +406,7 @@ static void pred8x8_tm_vp8_c(uint8_t *src, ptrdiff_t stride)
|
||||
* Set the intra prediction function pointers.
|
||||
*/
|
||||
void ff_h264_pred_init(H264PredContext *h, int codec_id, const int bit_depth,
|
||||
const int chroma_format_idc)
|
||||
int chroma_format_idc)
|
||||
{
|
||||
// MpegEncContext * const s = &h->s;
|
||||
|
||||
@ -566,6 +566,9 @@ void ff_h264_pred_init(H264PredContext *h, int codec_id, const int bit_depth,
|
||||
h->pred16x16_add[VERT_PRED8x8]= FUNCC(pred16x16_vertical_add , depth);\
|
||||
h->pred16x16_add[ HOR_PRED8x8]= FUNCC(pred16x16_horizontal_add , depth);\
|
||||
|
||||
if(!chroma_format_idc)
|
||||
chroma_format_idc = 1;
|
||||
|
||||
switch (bit_depth) {
|
||||
case 9:
|
||||
H264_PRED(9)
|
||||
|
Loading…
Reference in New Issue
Block a user