diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2016-06-29 15:39:46 +0300 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-06-29 15:49:15 +0300 |
| commit | 0c50f6905fb3cc18577e17db1993dc959d6a3db5 (patch) | |
| tree | 91bfe89ac60fff59fa66fa707904cb7359b64ee3 /libavcodec/h264_slice.c | |
| parent | e6e8750e943215535b35820cbe1533696512b613 (diff) | |
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>
Diffstat (limited to 'libavcodec/h264_slice.c')
| -rw-r--r-- | libavcodec/h264_slice.c | 8 |
1 files changed, 0 insertions, 8 deletions
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", |