[FFmpeg-cvslog] Merge commit 'eeeb5c291d3f78eaade5b99c2614c7cab0e9be79'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jun 21 10:41:41 2013 +0200| [5d509fbdcf6277716414702dc961d33c8e1eedcb] | committer: Michael Niedermayer

Merge commit 'eeeb5c291d3f78eaade5b99c2614c7cab0e9be79'

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

Conflicts:
	libavfilter/src_movie.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5d509fbdcf6277716414702dc961d33c8e1eedcb
---