Merge commit 'eeeb5c291d3f78eaade5b99c2614c7cab0e9be79'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 21 Jun 2013 08:41:41 +0000 (10:41 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 21 Jun 2013 08:41:41 +0000 (10:41 +0200)
commit5d509fbdcf6277716414702dc961d33c8e1eedcb
tree4d6c38c91afdff1eaae29a1aafa7faa9a3647cf6
parent8cdea50f6eee1271e24ff0c9590522f8323e87fe
parenteeeb5c291d3f78eaade5b99c2614c7cab0e9be79
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>
libavfilter/src_movie.c