| commit | 24de9df420df015c13e640db1b667227f277f024 | |
| author | Martin Jansa <Martin.Jansa@gmail.com> | |
| Wed, 28 Apr 2010 07:50:47 +0000 (28 09:50 +0200) | ||
| committer | Martin Jansa <Martin.Jansa@gmail.com> | |
| Wed, 28 Apr 2010 07:50:47 +0000 (28 09:50 +0200) | ||
| tree | c5ac1d651c0307ef4a4743fd3dba2ce9908bce2c | treesnapshot (tar.gz zip) |
| parent | 5b7a3c944e39b8dad17eeae2c3bdc038662f9352 | commitdiff |
| parent | f38efd166e43f5cae783f38f9913d2859557143e | commitdiff |
Merge remote branch 'mplayer/master'
Conflicts:
DOCS/tech/libvo.txt
libmpcodecs/mp_image.h
Conflicts:
DOCS/tech/libvo.txt
libmpcodecs/mp_image.h
| Makefile | diff1 | diff2 | blobhistory |
| configure | diff1 | diff2 | blobhistory |
| etc/codecs.conf | diff1 | diff2 | blobhistory |
| etc/input.conf | diff1 | diff2 | blobhistory |
| libvo/video_out.c | diff1 | diff2 | blobhistory |