aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/xma_parser.c
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2017-04-13 19:56:17 -0300
committerJames Almer <jamrial@gmail.com>2017-04-13 19:56:17 -0300
commit41b394bc612b0b96a8f015ac716ded6ef0ca9e0f (patch)
treed9546d39b216ab49903f3208d316837451411a9c /libavcodec/xma_parser.c
parent652ffbeaf10a4e33bd60f862049414ec7413f1a7 (diff)
parentdbfe60caca2e8323efa7aba6762dce7be2eba390 (diff)
downloadffmpeg-41b394bc612b0b96a8f015ac716ded6ef0ca9e0f.tar.gz
Merge commit 'dbfe60caca2e8323efa7aba6762dce7be2eba390'
* commit 'dbfe60caca2e8323efa7aba6762dce7be2eba390': vf_hwupload_cuda: Add min/max limits for device option This commit is a noop, see4df5a6a26a8aa08bbc6d027c2fb44fcf870e98d7 Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/xma_parser.c')
0 files changed, 0 insertions, 0 deletions