aboutsummaryrefslogtreecommitdiffstats
path: root/libswresample
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-07-22 12:54:56 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-07-22 12:55:11 +0200
commit4ec1cb24978e201062408ffebad18d8ef906a46d (patch)
tree203f149e748fc6570ced679bd6e5cacb79bd4605 /libswresample
parent7cdb3b2b79d78b7b3e686b3a53e904b4656d461f (diff)
parent78670fbf07bd03479073d4218440de4914304680 (diff)
downloadffmpeg-4ec1cb24978e201062408ffebad18d8ef906a46d.tar.gz
Merge commit '78670fbf07bd03479073d4218440de4914304680'
* commit '78670fbf07bd03479073d4218440de4914304680': imgconvert: cosmetics: Reshuffle defines to reduce ifdeffery Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample')
0 files changed, 0 insertions, 0 deletions