aboutsummaryrefslogtreecommitdiffstats
path: root/cmdutils.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-04-29 01:32:04 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-04-29 01:47:53 +0200
commit21c7e99659bea1ed735caa83399a5777957a8e16 (patch)
treebbd48ff5d66fa33e75aea9580aa881a09f25966d /cmdutils.c
parentc6eee3120a594cf25feb892f952a409a512d182e (diff)
parenta61c2115fb936d50b8b0328d00562fe529a7c46a (diff)
downloadffmpeg-21c7e99659bea1ed735caa83399a5777957a8e16.tar.gz
Merge commit 'a61c2115fb936d50b8b0328d00562fe529a7c46a'
* commit 'a61c2115fb936d50b8b0328d00562fe529a7c46a': configure: rework dxva in avconv handling Conflicts: Makefile configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'cmdutils.c')
0 files changed, 0 insertions, 0 deletions