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/svq3.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/svq3.c')
| -rw-r--r-- | libavcodec/svq3.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c index 992c100051..009fe13cd5 100644 --- a/libavcodec/svq3.c +++ b/libavcodec/svq3.c @@ -828,11 +828,11 @@ static int svq3_decode_slice_header(AVCodecContext *avctx) if ((header & 0x9F) == 2) { i = (h->mb_num < 64) ? 6 : (1 + av_log2(h->mb_num - 1)); - h->mb_skip_run = get_bits(&h->gb, i) - + sl->mb_skip_run = get_bits(&h->gb, i) - (h->mb_y * h->mb_width + h->mb_x); } else { skip_bits1(&h->gb); - h->mb_skip_run = 0; + sl->mb_skip_run = 0; } sl->slice_num = get_bits(&h->gb, 8); |