From df0cecdde02ca096774cf3c2adbf2738739d535a Mon Sep 17 00:00:00 2001 From: Luca Abeni Date: Mon, 21 May 2007 09:50:17 +0000 Subject: [PATCH] Do not try to set a video standard unless "-tvstd" is specified Originally committed as revision 9088 to svn://svn.ffmpeg.org/ffmpeg/trunk --- ffmpeg.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ffmpeg.c b/ffmpeg.c index c596c0058a..46449ea60c 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -182,7 +182,7 @@ static FILE *fvstats; static int rate_emu = 0; static int video_channel = 0; -static char *video_standard = "ntsc"; +static char *video_standard; static int audio_volume = 256; @@ -3834,6 +3834,8 @@ int main(int argc, char **argv) av_free(opt_names); + av_free(video_standard); + #ifdef CONFIG_POWERPC_PERF extern void powerpc_display_perf_report(void); powerpc_display_perf_report();