aboutsummaryrefslogtreecommitdiffstats
path: root/libswscale/options.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-05-29 11:31:22 +0200
committerMichael Niedermayer <michaelni@gmx.at>2015-05-29 11:31:26 +0200
commit4c0b30b07a81727561cafc171a1d0182a5975a48 (patch)
tree5d9d847a1e8cbe2fb08a84d6555750d468e8bfad /libswscale/options.c
parent392832fc3ab1b506b750ec8a1bcc83e1396bc7c9 (diff)
parent127d813bcb5705202b7100cf1eccd1e26d72ba14 (diff)
downloadffmpeg-4c0b30b07a81727561cafc171a1d0182a5975a48.tar.gz
Merge commit '127d813bcb5705202b7100cf1eccd1e26d72ba14'
* commit '127d813bcb5705202b7100cf1eccd1e26d72ba14': rtmpdh: Fix a local variable name in the nettle/gcrypt codepath Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/options.c')
0 files changed, 0 insertions, 0 deletions