OSDN Git Service

Merge branch 'master' of git://git.libav.org/libav
authoryukihane <yukihane.feather@gmail.com>
Mon, 1 Aug 2011 14:10:00 +0000 (23:10 +0900)
committeryukihane <yukihane.feather@gmail.com>
Mon, 1 Aug 2011 14:10:00 +0000 (23:10 +0900)
commit97c878908bc8b58683cde00259c49d930ef9065d
treea20e4cc8e516d840c58884825d68b0a2d4443177
parenta3effb29d9ff2b8982335c895de74d4f91ce0f4d
parentb4ea1c5a77704eb7096bc017467b774e088ef3bd
Merge branch 'master' of git://git.libav.org/libav

Conflicts:
libavfilter/Makefile
ffmpeg.c
libavfilter/Makefile