aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-05-06 00:03:57 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-05-06 00:37:47 +0200
commitedabbfbaf2c9bc478edc6169cd7714da68ba70b5 (patch)
treed0d7a4e84ae6e76e30c0c28c94c62786ff172382
parent26482ae716ba0966e75b4a8e8df76529baae3d54 (diff)
downloadffmpeg-edabbfbaf2c9bc478edc6169cd7714da68ba70b5.tar.gz
ff_h264_decode_seq_parameter_set: dont set h->sps
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/h264.c1
-rw-r--r--libavcodec/h264_ps.c2
2 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 05623fcb2b..d4a6c6a4f5 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -1478,6 +1478,7 @@ av_cold int ff_h264_decode_init(AVCodecContext *avctx)
ff_h264_pred_init(&h->hpc, h->avctx->codec_id, 8, 1);
h->dequant_coeff_pps = -1;
+ h->current_sps_id = -1;
/* needed so that IDCT permutation is known early */
if (CONFIG_ERROR_RESILIENCE)
diff --git a/libavcodec/h264_ps.c b/libavcodec/h264_ps.c
index 0cf86c2b1d..42a6903eef 100644
--- a/libavcodec/h264_ps.c
+++ b/libavcodec/h264_ps.c
@@ -544,8 +544,6 @@ int ff_h264_decode_seq_parameter_set(H264Context *h){
av_free(h->sps_buffers[sps_id]);
h->sps_buffers[sps_id] = sps;
- h->sps = *sps;
- h->current_sps_id = sps_id;
return 0;
fail: