wm4 85d185441a Merge branch 'input_changes' into master ... Conflicts: DOCS/man/en/vo.rst etc/input.conf input/input.c m_property.c		2012-10-12 11:53:53 +02:00
..
codecs.conf	ad_dvdpcm: add back PCM decoder for DVD	2012-09-18 21:08:14 +02:00
encoding-example-profiles.conf	Rename to "mpv"	2012-10-12 10:14:32 +02:00
example.conf	Rename to "mpv"	2012-10-12 10:14:32 +02:00
input.conf	Merge branch 'input_changes' into master	2012-10-12 11:53:53 +02:00
inttypes.h	…
mplayer.ico	…
mplayer.xpm	…