X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.0%2Fcinelerra%2Fffmpeg.C;fp=cinelerra-5.0%2Fcinelerra%2Fffmpeg.C;h=89175ff737032e2bf6790c7676f9f4ec280ebd34;hb=955d712ff475171e99d7910ead049a9342ca8b21;hp=decb3d0078260bf419a7469a16e00d62def79f89;hpb=e5013d46af178d2557a656a777d747e23cc3ae7f;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.0/cinelerra/ffmpeg.C b/cinelerra-5.0/cinelerra/ffmpeg.C
index decb3d00..89175ff7 100644
--- a/cinelerra-5.0/cinelerra/ffmpeg.C
+++ b/cinelerra-5.0/cinelerra/ffmpeg.C
@@ -941,8 +941,8 @@ FFMPEG::~FFMPEG()
 	delete flow_lock;
 	delete mux_lock;
 	av_dict_free(&opts);
-	delete opt_video_filter;
-	delete opt_audio_filter;
+	delete [] opt_video_filter;
+	delete [] opt_audio_filter;
 }
 
 int FFMPEG::check_sample_rate(AVCodec *codec, int sample_rate)
@@ -2070,6 +2070,11 @@ int FFVideoStream::create_filter(const char *filter_spec,
 		AVCodecContext *src_ctx, AVCodecContext *sink_ctx)
 {
 	avfilter_register_all();
+	AVFilter *filter = avfilter_get_by_name(filter_spec);
+	if( !filter || filter->inputs->type != AVMEDIA_TYPE_VIDEO ) {
+		ff_err(AVERROR(EINVAL), "FFVideoStream::create_filter: %s\n", filter_spec);
+		return -1;
+	}
 	filter_graph = avfilter_graph_alloc();
 	AVFilter *buffersrc = avfilter_get_by_name("buffer");
 	AVFilter *buffersink = avfilter_get_by_name("buffersink");
@@ -2101,6 +2106,11 @@ int FFAudioStream::create_filter(const char *filter_spec,
 		AVCodecContext *src_ctx, AVCodecContext *sink_ctx)
 {
 	avfilter_register_all();
+	AVFilter *filter = avfilter_get_by_name(filter_spec);
+	if( !filter || filter->inputs->type != AVMEDIA_TYPE_AUDIO ) {
+		ff_err(AVERROR(EINVAL), "FFAudioStream::create_filter: %s\n", filter_spec);
+		return -1;
+	}
 	filter_graph = avfilter_graph_alloc();
 	AVFilter *buffersrc = avfilter_get_by_name("abuffer");
 	AVFilter *buffersink = avfilter_get_by_name("abuffersink");