Merge commit 'eeeb5c291d3f78eaade5b99c2614c7cab0e9be79'

* commit 'eeeb5c291d3f78eaade5b99c2614c7cab0e9be79':
  vsrc_movie: do not free avoption variables in uninit()

Conflicts:
	libavfilter/src_movie.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-06-21 10:41:41 +02:00
commit 5d509fbdcf

View File

@ -322,7 +322,6 @@ static av_cold void movie_uninit(AVFilterContext *ctx)
if (movie->st[i].st)
avcodec_close(movie->st[i].st->codec);
}
av_freep(&movie->file_name);
av_freep(&movie->st);
av_freep(&movie->out_index);
av_frame_free(&movie->frame);