aboutsummaryrefslogtreecommitdiffstats
path: root/libavfilter/af_amerge.c
diff options
context:
space:
mode:
authorHendrik Leppkes <h.leppkes@gmail.com>2015-10-14 15:01:54 +0200
committerHendrik Leppkes <h.leppkes@gmail.com>2015-10-14 15:01:54 +0200
commit8ededd583622359062622cf008144a1511d50bbd (patch)
tree2d41ac6c1caa0153f9fe65fc1ae11f274ca81f02 /libavfilter/af_amerge.c
parent3d93ff289e0421d71cd63e246727d8ace256f27d (diff)
parent6a23a34274b747280c1e4a00ad22f97f99bbb48a (diff)
downloadffmpeg-8ededd583622359062622cf008144a1511d50bbd.tar.gz
Merge commit '6a23a34274b747280c1e4a00ad22f97f99bbb48a'
* commit '6a23a34274b747280c1e4a00ad22f97f99bbb48a': mimic: drop AVPicture usage Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavfilter/af_amerge.c')
0 files changed, 0 insertions, 0 deletions