diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2016-06-29 14:39:46 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-06-29 14:49:15 +0200 |
| commit | 0c50f6905fb3cc18577e17db1993dc959d6a3db5 (patch) | |
| tree | 91bfe89ac60fff59fa66fa707904cb7359b64ee3 | |
| parent | e6e8750e943215535b35820cbe1533696512b613 (diff) | |
| download | ffmpeg-0c50f6905fb3cc18577e17db1993dc959d6a3db5.tar.gz | |
avcodec/h264: Remove au_pps_id
This should not be needed anymore and simplifies the next merge
Requested-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/h264.c | 3 | ||||
| -rw-r--r-- | libavcodec/h264.h | 3 | ||||
| -rw-r--r-- | libavcodec/h264_slice.c | 8 |
3 files changed, 0 insertions, 14 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 935f2d038a..8eb3b13e12 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -950,9 +950,6 @@ again: h->has_recovery_point = 1; case NAL_SLICE: sl->gb = nal->gb; - if ( nals_needed >= i - || (!(avctx->active_thread_type & FF_THREAD_FRAME) && !context_count)) - h->au_pps_id = -1; if ((err = ff_h264_decode_slice_header(h, sl))) break; diff --git a/libavcodec/h264.h b/libavcodec/h264.h index cb24e33dd8..133f4b780c 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -515,9 +515,6 @@ typedef struct H264Context { uint32_t *mb2br_xy; int b_stride; // FIXME use s->b4_stride - - int au_pps_id; ///< pps_id of current access unit - uint16_t *slice_table; ///< slice_table_base + 2*mb_stride + 1 // interlacing specific flags diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 16595e00e6..45c23c8ff7 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -1139,12 +1139,6 @@ int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl) pps_id); return AVERROR_INVALIDDATA; } - if (h->au_pps_id >= 0 && pps_id != h->au_pps_id) { - av_log(h->avctx, AV_LOG_ERROR, - "PPS change from %d to %d forbidden\n", - h->au_pps_id, pps_id); - return AVERROR_INVALIDDATA; - } pps = (const PPS*)h->ps.pps_list[pps_id]->data; @@ -1780,8 +1774,6 @@ int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl) (sl->ref_list[j][i].reference & 3); } - h->au_pps_id = pps_id; - if (h->avctx->debug & FF_DEBUG_PICT_INFO) { av_log(h->avctx, AV_LOG_DEBUG, "slice:%d %s mb:%d %c%s%s pps:%u frame:%d poc:%d/%d ref:%d/%d qp:%d loop:%d:%d:%d weight:%d%s %s\n", |