aboutsummaryrefslogtreecommitdiffstats
path: root/libswscale
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-07-21 22:29:15 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-07-21 22:29:15 +0200
commit16c66f3151cfe54622492125b4c7654078582f96 (patch)
treef748736d4383434853dec7d8906d767e06a96172 /libswscale
parent9a436ae30f10614e74fa4e1a561ce91cb0b2dd77 (diff)
parent2ce53880bfeb431decdd2fc82298c0aff823ab47 (diff)
downloadffmpeg-16c66f3151cfe54622492125b4c7654078582f96.tar.gz
Merge commit '2ce53880bfeb431decdd2fc82298c0aff823ab47'
* commit '2ce53880bfeb431decdd2fc82298c0aff823ab47': build: Conditionally compile all avcodec test programs Conflicts: libavcodec/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale')
0 files changed, 0 insertions, 0 deletions