|
|
@@ -2679,9 +2679,6 @@ static void hl_decode_mb(H264Context *h){ |
|
|
const int mb_type= s->current_picture.mb_type[mb_xy]; |
|
|
const int mb_type= s->current_picture.mb_type[mb_xy]; |
|
|
int is_complex = CONFIG_SMALL || h->is_complex || IS_INTRA_PCM(mb_type) || s->qscale == 0; |
|
|
int is_complex = CONFIG_SMALL || h->is_complex || IS_INTRA_PCM(mb_type) || s->qscale == 0; |
|
|
|
|
|
|
|
|
if(CONFIG_H264_ENCODER && !s->decode) |
|
|
|
|
|
return; |
|
|
|
|
|
|
|
|
|
|
|
if (is_complex) |
|
|
if (is_complex) |
|
|
hl_decode_mb_complex(h); |
|
|
hl_decode_mb_complex(h); |
|
|
else hl_decode_mb_simple(h); |
|
|
else hl_decode_mb_simple(h); |
|
|
@@ -6605,7 +6602,7 @@ static int decode_slice(struct AVCodecContext *avctx, void *arg){ |
|
|
s->mb_skip_run= -1; |
|
|
s->mb_skip_run= -1; |
|
|
|
|
|
|
|
|
h->is_complex = FRAME_MBAFF || s->picture_structure != PICT_FRAME || s->codec_id != CODEC_ID_H264 || |
|
|
h->is_complex = FRAME_MBAFF || s->picture_structure != PICT_FRAME || s->codec_id != CODEC_ID_H264 || |
|
|
(CONFIG_GRAY && (s->flags&CODEC_FLAG_GRAY)) || (CONFIG_H264_ENCODER && s->encoding); |
|
|
|
|
|
|
|
|
(CONFIG_GRAY && (s->flags&CODEC_FLAG_GRAY)); |
|
|
|
|
|
|
|
|
if( h->pps.cabac ) { |
|
|
if( h->pps.cabac ) { |
|
|
int i; |
|
|
int i; |
|
|
|