OSDN Git Service

(root) / android-x86 / external-ffmpeg.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f7fee8f a5e6080)
Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 20 Mar 2013 11:03:49 +0000 (12:03 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 20 Mar 2013 11:03:53 +0000 (12:03 +0100)
* qatar/master:
  rtmp: Pass the parameters to do_adobe_auth in the right order

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

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