Merge with upstream
commitcc8b0decf22063bda7439fe23db53a68aeb16b47
authorKovenksy <diogomfranco@gmail.com>
Sat, 31 Oct 2009 22:24:07 +0000 (31 19:24 -0300)
committerKovenksy <diogomfranco@gmail.com>
Sat, 31 Oct 2009 22:24:07 +0000 (31 19:24 -0300)
treefb874b8fac5833a318cab3cc6a37a1ea399b32dc
parent6fc8a1375401016d97c61494f11231ac47e3db19
parent8bbb79c03a594e452fb9109dd6fda781d390a798
Merge with upstream
Makefile
libmpcodecs/vd_ffmpeg.c
mencoder.c
mplayer.c