OSDN Git Service

Merge tag 'n2.1.6' of git://source.ffmpeg.org/ffmpeg into kitkat-x86 android-x86-4.4-r2
authorChih-Wei Huang <cwhuang@linux.org.tw>
Wed, 31 Dec 2014 07:36:20 +0000 (15:36 +0800)
committerChih-Wei Huang <cwhuang@linux.org.tw>
Wed, 31 Dec 2014 07:36:20 +0000 (15:36 +0800)
FFmpeg 2.1.6 release


Trivial merge