aboutsummaryrefslogtreecommitdiffstats
path: root/libavfilter/avf_concat.c
diff options
context:
space:
mode:
authorClément Bœsch <u@pkh.me>2017-04-17 10:32:45 +0200
committerClément Bœsch <u@pkh.me>2017-04-17 10:32:45 +0200
commitbb71eb944c7abe4eccb6b21d4771751feca22980 (patch)
treee409a8ba94968d7ed094c9eb311dc0bfc21b620d /libavfilter/avf_concat.c
parentcc8cafae8775496a5a62285ad828db2d7fc1e7d8 (diff)
parentac648bb835edd3f67bda2267d0e72e5e582eb5a1 (diff)
downloadffmpeg-bb71eb944c7abe4eccb6b21d4771751feca22980.tar.gz
Merge commit 'ac648bb835edd3f67bda2267d0e72e5e582eb5a1'
* commit 'ac648bb835edd3f67bda2267d0e72e5e582eb5a1': dxva2: Simplify some ifdefs Merged-by: Clément Bœsch <u@pkh.me>
Diffstat (limited to 'libavfilter/avf_concat.c')
0 files changed, 0 insertions, 0 deletions