aboutsummaryrefslogtreecommitdiffstats
path: root/libavfilter/trim.c
diff options
context:
space:
mode:
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>2016-01-27 19:32:39 +0000
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>2016-01-27 19:32:39 +0000
commitba7d16a30353a7ff2833fd2ac2fbd3cd977d278f (patch)
tree4ffc0dd047de05f44a08a3edc87a0696465f2cd6 /libavfilter/trim.c
parentbd7da0ae7b6b91b9a9b2ab5c67bf16d6d5bd28a7 (diff)
parentc4de754d4dac5ddae4d5a6f02798c0f560771921 (diff)
downloadffmpeg-ba7d16a30353a7ff2833fd2ac2fbd3cd977d278f.tar.gz
Merge commit 'c4de754d4dac5ddae4d5a6f02798c0f560771921'
This is a NOOP. Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavfilter/trim.c')
0 files changed, 0 insertions, 0 deletions