diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 13:35:02 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 13:35:05 +0100 |
commit | c07b7e483af6a0bee49c0ac46030d9b10be4913b (patch) | |
tree | 1974d662325f6ecd0fc41c76ae6e1b7d73def4b0 /libavcodec/h264_cabac.c | |
parent | acd6b407c3cebc6dda899820d65e75ad1d75eb63 (diff) | |
parent | 5355ed6b20e941430c4f8fb82644e87a65366d61 (diff) | |
download | ffmpeg-streaming-c07b7e483af6a0bee49c0ac46030d9b10be4913b.zip ffmpeg-streaming-c07b7e483af6a0bee49c0ac46030d9b10be4913b.tar.gz |
Merge commit '5355ed6b20e941430c4f8fb82644e87a65366d61'
* commit '5355ed6b20e941430c4f8fb82644e87a65366d61':
h264: move {prev,next}_mb_skipped into the per-slice context
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264_cabac.c')
-rw-r--r-- | libavcodec/h264_cabac.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/h264_cabac.c b/libavcodec/h264_cabac.c index e47bd87..35ae3fd 100644 --- a/libavcodec/h264_cabac.c +++ b/libavcodec/h264_cabac.c @@ -1900,16 +1900,16 @@ int ff_h264_decode_mb_cabac(H264Context *h, H264SliceContext *sl) if( h->slice_type_nos != AV_PICTURE_TYPE_I ) { int skip; /* a skipped mb needs the aff flag from the following mb */ - if (FRAME_MBAFF(h) && (h->mb_y & 1) == 1 && h->prev_mb_skipped) - skip = h->next_mb_skipped; + if (FRAME_MBAFF(h) && (h->mb_y & 1) == 1 && sl->prev_mb_skipped) + skip = sl->next_mb_skipped; else skip = decode_cabac_mb_skip( h, h->mb_x, h->mb_y ); /* read skip flags */ if( skip ) { if (FRAME_MBAFF(h) && (h->mb_y & 1) == 0) { h->cur_pic.mb_type[mb_xy] = MB_TYPE_SKIP; - h->next_mb_skipped = decode_cabac_mb_skip( h, h->mb_x, h->mb_y+1 ); - if(!h->next_mb_skipped) + sl->next_mb_skipped = decode_cabac_mb_skip( h, h->mb_x, h->mb_y+1 ); + if(!sl->next_mb_skipped) h->mb_mbaff = h->mb_field_decoding_flag = decode_cabac_field_decoding_flag(h); } @@ -1929,7 +1929,7 @@ int ff_h264_decode_mb_cabac(H264Context *h, H264SliceContext *sl) h->mb_field_decoding_flag = decode_cabac_field_decoding_flag(h); } - h->prev_mb_skipped = 0; + sl->prev_mb_skipped = 0; fill_decode_neighbors(h, -(MB_FIELD(h))); |