OSDN Git Service

(root) / coroid / ffmpeg_saccubus.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3dc6022 f8c49d0)
Merge branch 'master' of git://git.videolan.org/ffmpeg rel20110806_inqubus1.5.0 test20110522
authoryukihane <yukihane.feather@gmail.com>
Sat, 21 May 2011 13:09:58 +0000 (22:09 +0900)
committeryukihane <yukihane.feather@gmail.com>
Sat, 21 May 2011 13:09:58 +0000 (22:09 +0900)
1  2 
ffmpeg.c patch | diff1 | diff2 | blob | history

diff --cc ffmpeg.c
Simple merge
さきゅばす/いんきゅばす用ffmpeg
About OSDN
Find Software
Develop Software
Help