aboutsummaryrefslogtreecommitdiffstats
path: root/libavfilter/vf_maskedmerge.c
diff options
context:
space:
mode:
authorClément Bœsch <u@pkh.me>2017-03-20 18:41:49 +0100
committerClément Bœsch <u@pkh.me>2017-03-20 18:42:37 +0100
commit072fad7cf536d4d5be69238bd385d42248b28405 (patch)
tree6f402767f1dd0154ffa7188de9a118a86a045222 /libavfilter/vf_maskedmerge.c
parent3898e346b33515897d6ea83369f39e9d10a419bb (diff)
parent1d6c76e11febb58738c9647c47079d02b5e10094 (diff)
downloadffmpeg-072fad7cf536d4d5be69238bd385d42248b28405.tar.gz
Merge commit '1d6c76e11febb58738c9647c47079d02b5e10094'
* commit '1d6c76e11febb58738c9647c47079d02b5e10094': audiodsp/x86: fix ff_vector_clip_int32_sse2 No functionnal changes, only cosmetics. This issue was fixed in 9a9e2f1c8aa4539a261625145e5c1f46a8106ac2. Merged-by: Clément Bœsch <u@pkh.me>
Diffstat (limited to 'libavfilter/vf_maskedmerge.c')
0 files changed, 0 insertions, 0 deletions