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 | 47a0d393504d6726c4a235951153bee0abb3f7d6 (patch) | |
| tree | cd95f60982a26521bbdc356d84161d05b674af6f /libavcodec/h264_slice.c | |
| parent | 9951907f6fc37a8d41566dbee09f7c15ff587de6 (diff) | |
| download | ffmpeg-47a0d393504d6726c4a235951153bee0abb3f7d6.tar.gz | |
h264: move mb_skip_run into the per-slice context
Diffstat (limited to 'libavcodec/h264_slice.c')
| -rw-r--r-- | libavcodec/h264_slice.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 2e319e9daa..43185c59b4 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -2183,7 +2183,7 @@ static int decode_slice(struct AVCodecContext *avctx, void *arg) H264Context *h = sl->h264; int lf_x_start = h->mb_x; - h->mb_skip_run = -1; + sl->mb_skip_run = -1; h->is_complex = FRAME_MBAFF(h) || h->picture_structure != PICT_FRAME || avctx->codec_id != AV_CODEC_ID_H264 || @@ -2314,7 +2314,7 @@ static int decode_slice(struct AVCodecContext *avctx, void *arg) } } - if (get_bits_left(&h->gb) <= 0 && h->mb_skip_run <= 0) { + if (get_bits_left(&h->gb) <= 0 && sl->mb_skip_run <= 0) { tprintf(h->avctx, "slice end %d %d\n", get_bits_count(&h->gb), h->gb.size_in_bits); |