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_cavlc.c | |
| parent | acd6b407c3cebc6dda899820d65e75ad1d75eb63 (diff) | |
| parent | 5355ed6b20e941430c4f8fb82644e87a65366d61 (diff) | |
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_cavlc.c')
| -rw-r--r-- | libavcodec/h264_cavlc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264_cavlc.c b/libavcodec/h264_cavlc.c index 85659fd8da..dd98b759f0 100644 --- a/libavcodec/h264_cavlc.c +++ b/libavcodec/h264_cavlc.c @@ -729,7 +729,7 @@ int ff_h264_decode_mb_cavlc(H264Context *h, H264SliceContext *sl) h->mb_mbaff = h->mb_field_decoding_flag = get_bits1(&h->gb); } - h->prev_mb_skipped= 0; + sl->prev_mb_skipped = 0; mb_type= get_ue_golomb(&h->gb); if(h->slice_type_nos == AV_PICTURE_TYPE_B){ |