[FFmpeg-cvslog] ff_h264_decode_seq_parameter_set: dont set h->sps

Michael Niedermayer git at videolan.org
Mon May 6 02:24:25 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon May  6 00:03:57 2013 +0200| [edabbfbaf2c9bc478edc6169cd7714da68ba70b5] | committer: Michael Niedermayer

ff_h264_decode_seq_parameter_set: dont set h->sps

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=edabbfbaf2c9bc478edc6169cd7714da68ba70b5
---

 libavcodec/h264.c    |    1 +
 libavcodec/h264_ps.c |    2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 05623fc..d4a6c6a 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 0cf86c2..42a6903 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:



More information about the ffmpeg-cvslog mailing list