aboutsummaryrefslogtreecommitdiffstats
path: root/libswresample/soxr_resample.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-05-19 21:39:24 +0200
committerMichael Niedermayer <michaelni@gmx.at>2015-05-19 21:54:04 +0200
commit1ab5f63941fda78d4af256cc2529df9460b36c1a (patch)
treea93a35a3d7173520d35326fc10d5659ad06a8e18 /libswresample/soxr_resample.c
parent9005075f397bc7bd2fa2e193f62cbf971bdaa4d4 (diff)
parent0f50c53cfb959162f2bccc1a2c2e066d35723595 (diff)
downloadffmpeg-1ab5f63941fda78d4af256cc2529df9460b36c1a.tar.gz
Merge commit '0f50c53cfb959162f2bccc1a2c2e066d35723595' into release/2.4
* commit '0f50c53cfb959162f2bccc1a2c2e066d35723595': png: Set the color range as full range Conflicts: libavcodec/pngdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample/soxr_resample.c')
0 files changed, 0 insertions, 0 deletions