Merge commit '16a645adeb758207346a4bbf66766f02734c461e'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 17 May 2013 09:41:09 +0000 (11:41 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 17 May 2013 09:41:14 +0000 (11:41 +0200)
commit1e9a050bc020825094684ba27fc28025bf0a8088
treec6fa6d06f319ff52970b3f28451d7ec66c9f23f9
parent71fcb6072ea6258b28e6267a3d7d5287569b2f26
parent16a645adeb758207346a4bbf66766f02734c461e
Merge commit '16a645adeb758207346a4bbf66766f02734c461e'

* commit '16a645adeb758207346a4bbf66766f02734c461e':
  vf_pixdesctest: make config_props work properly when called multiple times.
  vf_hqdn3d: make config_props work properly when called multiple times.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavfilter/vf_hqdn3d.c
libavfilter/vf_pixdesctest.c