aboutsummaryrefslogtreecommitdiffstats
path: root/libswresample/resample.c
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2017-09-27 20:29:20 -0300
committerJames Almer <jamrial@gmail.com>2017-09-27 20:29:20 -0300
commit91feb62b3dbfb49632e69ebc1cb4ffff6a22eac5 (patch)
tree120a039b2802620d855056253fb48d9d6c5596c2 /libswresample/resample.c
parentd96363cc8437c9de8fd747068ab331510149810c (diff)
parenta52976c0feab6e86138983c248bd01fa45cdda69 (diff)
downloadffmpeg-91feb62b3dbfb49632e69ebc1cb4ffff6a22eac5.tar.gz
Merge commit 'a52976c0feab6e86138983c248bd01fa45cdda69'
* commit 'a52976c0feab6e86138983c248bd01fa45cdda69': nvenc: make gpu indices independent of supported capabilities This commit is a noop, see 5403d90f32656719a766254d77bbe4411e473eed Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libswresample/resample.c')
0 files changed, 0 insertions, 0 deletions