aboutsummaryrefslogtreecommitdiffstats
path: root/libpostproc
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-05-17 10:51:59 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-05-17 10:51:59 +0200
commitd5e5e73c52d3e2e1d853b2d485223d3c7b01da4f (patch)
treee45e9c33d49036e03e84c6bd352ae3c05c5e823a /libpostproc
parent5bc892cb17225c8bfd54c12abf45012f393f03e3 (diff)
parentd371c3c2e2830d9783465ecfe1ab7d93351083b7 (diff)
downloadffmpeg-d5e5e73c52d3e2e1d853b2d485223d3c7b01da4f.tar.gz
Merge commit 'd371c3c2e2830d9783465ecfe1ab7d93351083b7'
* commit 'd371c3c2e2830d9783465ecfe1ab7d93351083b7': vf_frei0r: make config_props work properly when called multiple times. vf_gradfun: make config_props work properly when called multiple times. vf_lut: make config_props work properly when called multiple times. Conflicts: libavfilter/vf_lut.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libpostproc')
0 files changed, 0 insertions, 0 deletions