| commit | 68e70b3ec34af2e1002d17d0dc81b3408a399ade | |
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | |
| Mon, 16 Jun 2008 23:18:10 +0000 (17 02:18 +0300) | ||
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | |
| Tue, 17 Jun 2008 02:04:32 +0000 (17 05:04 +0300) | ||
| tree | b6b00fd57b24e713e0dc180b64d266b958df7daa | treesnapshot (tar.gz zip) |
| parent | af3fcdf2ded43e887bceed3a957b5cc4f7dbc2c6 | commitdiff |
| parent | dcd0902bcdb1a62f4246cbfba48bd1b77841ceda | commitdiff |
Merge svn changes up to r27092
Conflicts:
libmpdemux/demuxer.c
libvo/vo_xv.c
mencoder.c
Conflicts:
libmpdemux/demuxer.c
libvo/vo_xv.c
mencoder.c