diff options
| author | Anton Khirnov <anton@khirnov.net> | 2015-01-18 00:28:46 +0300 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2015-03-21 13:27:14 +0300 |
| commit | 07c5ca551b7327d3c4e33738cc0cd2d5ac2779fa (patch) | |
| tree | dba091d3cb6911a25d6179f19fd8e99da7efe038 /libavcodec/h264_slice.c | |
| parent | 47a0d393504d6726c4a235951153bee0abb3f7d6 (diff) | |
h264: move is_complex into the per-slice context
Diffstat (limited to 'libavcodec/h264_slice.c')
| -rw-r--r-- | libavcodec/h264_slice.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 43185c59b4..1e233ad27e 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -2185,9 +2185,9 @@ static int decode_slice(struct AVCodecContext *avctx, void *arg) sl->mb_skip_run = -1; - h->is_complex = FRAME_MBAFF(h) || h->picture_structure != PICT_FRAME || - avctx->codec_id != AV_CODEC_ID_H264 || - (CONFIG_GRAY && (h->flags & CODEC_FLAG_GRAY)); + sl->is_complex = FRAME_MBAFF(h) || h->picture_structure != PICT_FRAME || + avctx->codec_id != AV_CODEC_ID_H264 || + (CONFIG_GRAY && (h->flags & CODEC_FLAG_GRAY)); if (h->pps.cabac) { /* realign */ |