aboutsummaryrefslogtreecommitdiffstats
path: root/libavfilter/vf_blend.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-03-24 11:24:21 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-03-24 11:40:12 +0100
commit153073201cdcfd641042114b2bd39b00a532cbb9 (patch)
tree1707014dbbf8693589068934a6c29fc41511b026 /libavfilter/vf_blend.c
parentc5d0148c7e6d5ded4970d843ae6ef5864958e701 (diff)
parenta8c99205ca8703bd849efae13fcf844315c7147d (diff)
downloadffmpeg-153073201cdcfd641042114b2bd39b00a532cbb9.tar.gz
Merge commit 'a8c99205ca8703bd849efae13fcf844315c7147d'
* commit 'a8c99205ca8703bd849efae13fcf844315c7147d': avisynth: Fix compilation against current 2.6 header(s). Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vf_blend.c')
0 files changed, 0 insertions, 0 deletions