diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 17:25:31 +0300 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 17:27:29 +0300 |
commit | 35a788d953838c1b7f34038ef54fddc3d11994fe (patch) | |
tree | cf8179e051dbf1881f591317f4146a2edbd738dc /libavcodec/h264_cabac.c | |
parent | cc2cfdc49786a8268d1514661c17ea96035d6f1d (diff) | |
parent | b063582e0c4f775a8ba377488bd085595e0e7fae (diff) |
Merge commit 'b063582e0c4f775a8ba377488bd085595e0e7fae'
* commit 'b063582e0c4f775a8ba377488bd085595e0e7fae':
h264: move intra_pcm_ptr into the per-slice context
Conflicts:
libavcodec/h264.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264_cabac.c')
-rw-r--r-- | libavcodec/h264_cabac.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264_cabac.c b/libavcodec/h264_cabac.c index 889b35e243..d2a8fb0090 100644 --- a/libavcodec/h264_cabac.c +++ b/libavcodec/h264_cabac.c @@ -2034,7 +2034,7 @@ decode_intra_mb: // The pixels are stored in the same order as levels in h->mb array. if ((int) (h->cabac.bytestream_end - ptr) < mb_size) return -1; - h->intra_pcm_ptr = ptr; + sl->intra_pcm_ptr = ptr; ptr += mb_size; ff_init_cabac_decoder(&h->cabac, ptr, h->cabac.bytestream_end - ptr); |