[FFmpeg-cvslog] Merge commit '3fb29588a27a711132106b924e27b53789a58dcb'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri May 17 11:28:15 2013 +0200| [71fcb6072ea6258b28e6267a3d7d5287569b2f26] | committer: Michael Niedermayer

Merge commit '3fb29588a27a711132106b924e27b53789a58dcb'

* commit '3fb29588a27a711132106b924e27b53789a58dcb':
  vf_drawtext: don't leak the expressions.
  vf_crop: make config_props work properly when called multiple times.
  vf_setdar: make config_props work properly when called multiple times.

Conflicts:
	libavfilter/vf_aspect.c
	libavfilter/vf_drawtext.c

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

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