| commit | bc0f5249090cec1c460a910c2f46d2c760a2a3fe | |
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | |
| Tue, 9 Mar 2010 17:44:28 +0000 (9 19:44 +0200) | ||
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | |
| Tue, 9 Mar 2010 17:44:28 +0000 (9 19:44 +0200) | ||
| tree | 91ea711bd517d7ebd21f96dc1e9e64da3e7953ac | treesnapshot (tar.gz zip) |
| parent | a1b84c208002a293e663673af26ccaf639ae726f | commitdiff |
| parent | bc802c1e3efbe92cf653c415db5143291f096af4 | commitdiff |
Merge svn changes up to r30502
Conflicts:
libswscale/rgb2rgb.c
libswscale/rgb2rgb.h
libswscale/swscale.c
libvo/x11_common.c
Conflicts:
libswscale/rgb2rgb.c
libswscale/rgb2rgb.h
libswscale/swscale.c
libvo/x11_common.c
| libmpdemux/demux_lavf.c | diff1 | diff2 | blobhistory |
| libvo/x11_common.c | diff1 | diff2 | blobhistory |
| stream/stream_ffmpeg.c | diff1 | diff2 | blobhistory |