Commit 19615089 authored by Anton Khirnov's avatar Anton Khirnov

ffmpeg.c: reset avoptions after each input/output file.

This is consistent with how all the other options work.
parent 1435f2fa
...@@ -88,6 +88,7 @@ void uninit_opts(void) ...@@ -88,6 +88,7 @@ void uninit_opts(void)
} }
av_freep(&opt_names); av_freep(&opt_names);
av_freep(&opt_values); av_freep(&opt_values);
opt_name_count = 0;
} }
void log_callback_help(void* ptr, int level, const char* fmt, va_list vl) void log_callback_help(void* ptr, int level, const char* fmt, va_list vl)
......
...@@ -3305,6 +3305,8 @@ static void opt_input_file(const char *filename) ...@@ -3305,6 +3305,8 @@ static void opt_input_file(const char *filename)
av_freep(&video_codec_name); av_freep(&video_codec_name);
av_freep(&audio_codec_name); av_freep(&audio_codec_name);
av_freep(&subtitle_codec_name); av_freep(&subtitle_codec_name);
uninit_opts();
init_opts();
} }
static void check_inputs(int *has_video_ptr, static void check_inputs(int *has_video_ptr,
...@@ -3850,6 +3852,8 @@ static void opt_output_file(const char *filename) ...@@ -3850,6 +3852,8 @@ static void opt_output_file(const char *filename)
set_context_opts(oc, avformat_opts, AV_OPT_FLAG_ENCODING_PARAM, NULL); set_context_opts(oc, avformat_opts, AV_OPT_FLAG_ENCODING_PARAM, NULL);
av_freep(&forced_key_frames); av_freep(&forced_key_frames);
uninit_opts();
init_opts();
} }
/* same option as mencoder */ /* same option as mencoder */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment