diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 15:25:31 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 15:27:29 +0100 |
| commit | 35a788d953838c1b7f34038ef54fddc3d11994fe (patch) | |
| tree | cf8179e051dbf1881f591317f4146a2edbd738dc /libavcodec/h264_cavlc.c | |
| parent | cc2cfdc49786a8268d1514661c17ea96035d6f1d (diff) | |
| parent | b063582e0c4f775a8ba377488bd085595e0e7fae (diff) | |
| download | ffmpeg-35a788d953838c1b7f34038ef54fddc3d11994fe.tar.gz | |
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_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 33981a6b57..09b5038a18 100644 --- a/libavcodec/h264_cavlc.c +++ b/libavcodec/h264_cavlc.c @@ -778,7 +778,7 @@ decode_intra_mb: h->sps.bit_depth_luma; // We assume these blocks are very rare so we do not optimize it. - h->intra_pcm_ptr = align_get_bits(&h->gb); + sl->intra_pcm_ptr = align_get_bits(&h->gb); if (get_bits_left(&h->gb) < mb_size) { av_log(h->avctx, AV_LOG_ERROR, "Not enough data for an intra PCM block.\n"); return AVERROR_INVALIDDATA; |