[SCM] libav/experimental: Dont crash if resampling is requested but no audio packets are ever processed.

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:11:28 UTC 2013


The following commit has been merged in the experimental branch:
commit 8e4270c551533598a8c9861f7c75eae04d0e38ac
Author: Andreas Öman <andreas at lonelycoder.com>
Date:   Mon Jan 7 20:42:45 2008 +0000

    Dont crash if resampling is requested but no audio packets are ever processed.
    
    Originally committed as revision 11449 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/ffmpeg.c b/ffmpeg.c
index 6c22053..12db8a8 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -2057,7 +2057,7 @@ static int av_encode(AVFormatContext **output_files,
                 av_free(ost->pict_tmp.data[0]);
                 if (ost->video_resample)
                     sws_freeContext(ost->img_resample_ctx);
-                if (ost->audio_resample)
+                if (ost->resample)
                     audio_resample_close(ost->resample);
                 av_free(ost);
             }

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list