[SCM] libav/experimental: Make frames non reference by default, so they are disposed of automatically in MPV_frame_start() if we break out due to an error at a random place. Fixes issue334

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:25:35 UTC 2013


The following commit has been merged in the experimental branch:
commit 197ea524433322064ebcbeee437c8695b01aab00
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Fri Jul 18 20:59:17 2008 +0000

    Make frames non reference by default, so they are disposed of automatically
    in MPV_frame_start() if we break out due to an error at a random place.
    Fixes issue334
    
    Originally committed as revision 14283 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index ebdfc8c..862e7a0 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -2259,6 +2259,7 @@ static int frame_start(H264Context *h){
         memset(h->slice_table, -1, (s->mb_height*s->mb_stride-1) * sizeof(uint8_t));
 
 //    s->decode= (s->flags&CODEC_FLAG_PSNR) || !s->encoding || s->current_picture.reference /*|| h->contains_intra*/ || 1;
+    s->current_picture_ptr->reference= 0;
     return 0;
 }
 

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list