[SCM] libav/experimental: reset manually selected codecs at the end of opt_input_file, to avoid propagating selection to output file

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:10:45 UTC 2013


The following commit has been merged in the experimental branch:
commit a06a18c55dfade76ba5f560d9d8be71951638792
Author: Baptiste Coudurier <baptiste.coudurier at gmail.com>
Date:   Fri Dec 21 10:08:43 2007 +0000

    reset manually selected codecs at the end of opt_input_file, to avoid propagating selection to output file
    
    Originally committed as revision 11289 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/ffmpeg.c b/ffmpeg.c
index 1fbae5e..9ffa2fb 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -2790,6 +2790,9 @@ static void opt_input_file(const char *filename)
     video_channel = 0;
 
     rate_emu = 0;
+    av_freep(&video_codec_name);
+    av_freep(&audio_codec_name);
+    av_freep(&subtitle_codec_name);
 }
 
 static void check_audio_video_sub_inputs(int *has_video_ptr, int *has_audio_ptr,

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list