diff options
| author | Anton Khirnov <anton@khirnov.net> | 2015-01-17 22:28:46 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2015-03-21 11:27:14 +0100 |
| commit | 07c5ca551b7327d3c4e33738cc0cd2d5ac2779fa (patch) | |
| tree | dba091d3cb6911a25d6179f19fd8e99da7efe038 /libavcodec/h264_mb.c | |
| parent | 47a0d393504d6726c4a235951153bee0abb3f7d6 (diff) | |
h264: move is_complex into the per-slice context
Diffstat (limited to 'libavcodec/h264_mb.c')
| -rw-r--r-- | libavcodec/h264_mb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264_mb.c b/libavcodec/h264_mb.c index d29e2c632f..09d31ecfaf 100644 --- a/libavcodec/h264_mb.c +++ b/libavcodec/h264_mb.c @@ -814,7 +814,7 @@ void ff_h264_hl_decode_mb(H264Context *h, H264SliceContext *sl) { const int mb_xy = h->mb_xy; const int mb_type = h->cur_pic.mb_type[mb_xy]; - int is_complex = CONFIG_SMALL || h->is_complex || + int is_complex = CONFIG_SMALL || sl->is_complex || IS_INTRA_PCM(mb_type) || sl->qscale == 0; if (CHROMA444(h)) { |