diff options
| author | Vittorio Giovara <vittorio.giovara@gmail.com> | 2014-02-13 00:43:17 +0100 |
|---|---|---|
| committer | Vittorio Giovara <vittorio.giovara@gmail.com> | 2014-02-14 05:05:46 +0100 |
| commit | 3a0576702825423abecb32627c530dbc4c0f73bc (patch) | |
| tree | 54773607d51e7045dc8b11a93a5aa8937be5fdc9 /libavcodec/h264.c | |
| parent | 73e8fab31dc19c4371499e612856accbc00b2820 (diff) | |
h264: store current_sps_id inside the current sps
In preparation for MVC support.
Diffstat (limited to 'libavcodec/h264.c')
| -rw-r--r-- | libavcodec/h264.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index c193630086..dfabcf5ae2 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -3414,12 +3414,11 @@ static int decode_slice_header(H264Context *h, H264Context *h0) return AVERROR_INVALIDDATA; } - if (h->pps.sps_id != h->current_sps_id || + if (h->pps.sps_id != h->sps.sps_id || h0->sps_buffers[h->pps.sps_id]->new) { h0->sps_buffers[h->pps.sps_id]->new = 0; - h->current_sps_id = h->pps.sps_id; - h->sps = *h0->sps_buffers[h->pps.sps_id]; + h->sps = *h0->sps_buffers[h->pps.sps_id]; if (h->bit_depth_luma != h->sps.bit_depth_luma || h->chroma_format_idc != h->sps.chroma_format_idc) { |