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_cavlc.c | |
| parent | 9951907f6fc37a8d41566dbee09f7c15ff587de6 (diff) | |
| download | ffmpeg-47a0d393504d6726c4a235951153bee0abb3f7d6.tar.gz | |
h264: move mb_skip_run into the per-slice context
Diffstat (limited to 'libavcodec/h264_cavlc.c')
| -rw-r--r-- | libavcodec/h264_cavlc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/h264_cavlc.c b/libavcodec/h264_cavlc.c index b16b6b66c2..0ef5dcfe4f 100644 --- a/libavcodec/h264_cavlc.c +++ b/libavcodec/h264_cavlc.c @@ -709,12 +709,12 @@ int ff_h264_decode_mb_cavlc(H264Context *h, H264SliceContext *sl) cbp = 0; /* avoid warning. FIXME: find a solution without slowing down the code */ if (sl->slice_type_nos != AV_PICTURE_TYPE_I) { - if(h->mb_skip_run==-1) - h->mb_skip_run= get_ue_golomb(&h->gb); + if (sl->mb_skip_run == -1) + sl->mb_skip_run = get_ue_golomb(&h->gb); - if (h->mb_skip_run--) { + if (sl->mb_skip_run--) { if(FRAME_MBAFF(h) && (h->mb_y&1) == 0){ - if(h->mb_skip_run==0) + if (sl->mb_skip_run == 0) h->mb_mbaff = h->mb_field_decoding_flag = get_bits1(&h->gb); } decode_mb_skip(h, sl); |