diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-07-25 02:14:16 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-07-25 02:50:58 +0300 |
| commit | 3a69d65f8d07c54f4c9eb2d9c89ab50e35d0a50d (patch) | |
| tree | 1ba215c9978eadcd6b99b2c696b22ea6a3779e33 /etc | |
| parent | 577587ec6ce8dad59c303a76cba03af03db879a3 (diff) | |
| parent | 901574e3bf6ff45a46a12dc7884a93970f9d58d1 (diff) | |
| download | mpv-3a69d65f8d07c54f4c9eb2d9c89ab50e35d0a50d.tar.bz2 mpv-3a69d65f8d07c54f4c9eb2d9c89ab50e35d0a50d.tar.xz | |
Merge svn changes up to r27347
Conflicts:
libvo/x11_common.c
libvo/x11_common.h
Rename the vo_gl macro "vo_border()" to "vo_gl_border" as it conflicts
with the global variable "vo_border"; done in the merge commit because
uses of the macro needed changes anyway to resolve conflicts.
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/codecs.conf | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf index 5e3847d243..aa539fbdcf 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -708,6 +708,22 @@ videocodec ffwv1f dll mpeg4 out YV12,I420,IYUV flip +videocodec fflibschroedinger + info "Dirac (through FFmpeg libschroedinger)" + status working + fourcc drac + driver ffmpeg + dll libschroedinger + out I420,IYUV,422P,444P + +videocodec fflibdirac + info "Dirac (through FFmpeg libdirac)" + status working + fourcc drac + driver ffmpeg + dll libdirac + out I420,IYUV,422P,444P + videocodec xvid info "Xvid (MPEG-4)" status working |