-
Michael Niedermayer authored
* commit 'eeeb5c29': vsrc_movie: do not free avoption variables in uninit() Conflicts: libavfilter/src_movie.c Merged-by:
Michael Niedermayer <michaelni@gmx.at>
5d509fbd
* commit 'eeeb5c29': vsrc_movie: do not free avoption variables in uninit() Conflicts: libavfilter/src_movie.c Merged-by:Michael Niedermayer <michaelni@gmx.at>