diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 16:09:14 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 16:09:14 +0100 |
| commit | 70eec8f432dcee5b9867ba01a26436a04a9a0423 (patch) | |
| tree | c8880981559e31c14696486f7b300ed5c9cf0076 /libavcodec/h264_cavlc.c | |
| parent | da7f4c32ab6bf517d4ef51297da46cf459479b22 (diff) | |
| parent | 47a0d393504d6726c4a235951153bee0abb3f7d6 (diff) | |
| download | ffmpeg-70eec8f432dcee5b9867ba01a26436a04a9a0423.tar.gz | |
Merge commit '47a0d393504d6726c4a235951153bee0abb3f7d6'
* commit '47a0d393504d6726c4a235951153bee0abb3f7d6':
h264: move mb_skip_run into the per-slice context
Conflicts:
libavcodec/h264_cavlc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
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 ab60f83baa..a0e3a725ba 100644 --- a/libavcodec/h264_cavlc.c +++ b/libavcodec/h264_cavlc.c @@ -717,12 +717,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_long(&h->gb); + if (sl->mb_skip_run == -1) + sl->mb_skip_run = get_ue_golomb_long(&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); |