diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-14 15:00:28 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-14 15:17:51 +0100 |
| commit | b9d887c225466576ae80ef7f2b109e866ff137b2 (patch) | |
| tree | 61ffb780b58021fe4186fb2caad3a8fdcb09bc5f /libavcodec/h264_ps.c | |
| parent | b6e7041f90daf89b17a10bcd73cd3b42d4e3540a (diff) | |
| parent | 072be3e8969f24113d599444be4d6a0ed04a6602 (diff) | |
| download | ffmpeg-b9d887c225466576ae80ef7f2b109e866ff137b2.tar.gz | |
Merge commit '072be3e8969f24113d599444be4d6a0ed04a6602'
* commit '072be3e8969f24113d599444be4d6a0ed04a6602':
h264: set parameters from SPS whenever it changes
asyncts: cosmetics: reindent
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264_ps.c')
| -rw-r--r-- | libavcodec/h264_ps.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libavcodec/h264_ps.c b/libavcodec/h264_ps.c index aef1ca6ba1..4b81c9877d 100644 --- a/libavcodec/h264_ps.c +++ b/libavcodec/h264_ps.c @@ -517,10 +517,13 @@ int ff_h264_decode_seq_parameter_set(H264Context *h){ h->sps.bitstream_restriction_flag ? sps->num_reorder_frames : -1 ); } + sps->new = 1; av_free(h->sps_buffers[sps_id]); - h->sps_buffers[sps_id]= sps; - h->sps = *sps; + h->sps_buffers[sps_id] = sps; + h->sps = *sps; + h->current_sps_id = sps_id; + return 0; fail: av_free(sps); |