Merge commit '3fb29588a27a711132106b924e27b53789a58dcb'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 17 May 2013 09:28:15 +0000 (11:28 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 17 May 2013 09:29:22 +0000 (11:29 +0200)
commit71fcb6072ea6258b28e6267a3d7d5287569b2f26
tree60e319e1c9bf07580a9a50194be7cf7758801154
parentc7078f4907dcff6877cf38f48526788c10644f07
parent3fb29588a27a711132106b924e27b53789a58dcb
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@gmx.at>
libavfilter/vf_aspect.c
libavfilter/vf_crop.c
libavfilter/vf_drawtext.c