OSDN Git Service

(root) / android-x86 / external-ffmpeg.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 392832f 127d813)
Merge commit '127d813bcb5705202b7100cf1eccd1e26d72ba14'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 29 May 2015 09:31:22 +0000 (11:31 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 29 May 2015 09:31:26 +0000 (11:31 +0200)
* commit '127d813bcb5705202b7100cf1eccd1e26d72ba14':
  rtmpdh: Fix a local variable name in the nettle/gcrypt codepath

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/rtmpdh.c patch | diff1 | diff2 | blob | history

diff --cc libavformat/rtmpdh.c
Simple merge
external/ffmpeg
About OSDN
Find Software
Develop Software
Help