[FFmpeg-cvslog] Merge commit '16a645adeb758207346a4bbf66766f02734c461e'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri May 17 11:41:09 2013 +0200| [1e9a050bc020825094684ba27fc28025bf0a8088] | committer: Michael Niedermayer

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 at gmx.at>

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