diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-09 23:37:00 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-09 23:37:00 +0200 |
| commit | 42bf12c2d3b2903a127f625dea0d3516a87debfa (patch) | |
| tree | 7fe1a2c4a3c250d44b9ff2a8bdf3809104744eb9 /etc | |
| parent | fa34ea27b94cd870ec56de4ce215bf797054119f (diff) | |
| parent | 3c514ea708749679623ae04fc8f7ade87e51aade (diff) | |
| download | mpv-42bf12c2d3b2903a127f625dea0d3516a87debfa.tar.bz2 mpv-42bf12c2d3b2903a127f625dea0d3516a87debfa.tar.xz | |
Merge svn changes up to r30595
Conflicts:
mplayer.c
vidix/nvidia_vid.c
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/codecs.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf index c3f2c6987b..85a212b027 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -583,7 +583,7 @@ videocodec theora fourcc theo,Thra driver theora dll libtheora - out YV12 + out YV12,422P,444P ; prefer native codecs over win32? ; the win32 codecs probably are (better) optimized and support direct |