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 /libmpcodecs | |
| 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 'libmpcodecs')
| -rw-r--r-- | libmpcodecs/ve_lavc.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libmpcodecs/ve_lavc.c b/libmpcodecs/ve_lavc.c index f217258c0b..535791fdc9 100644 --- a/libmpcodecs/ve_lavc.c +++ b/libmpcodecs/ve_lavc.c @@ -1021,6 +1021,10 @@ static int vf_open(vf_instance_t *vf, char* args){ mux_v->bih->biCompression = mmioFOURCC('d', 'v', 's', 'd'); else if (!strcasecmp(lavc_param_vcodec, "libx264")) mux_v->bih->biCompression = mmioFOURCC('h', '2', '6', '4'); + else if (!strcasecmp(lavc_param_vcodec, "libschroedinger")) + mux_v->bih->biCompression = mmioFOURCC('d', 'r', 'a', 'c'); + else if (!strcasecmp(lavc_param_vcodec, "libdirac")) + mux_v->bih->biCompression = mmioFOURCC('d', 'r', 'a', 'c'); else mux_v->bih->biCompression = mmioFOURCC(lavc_param_vcodec[0], lavc_param_vcodec[1], lavc_param_vcodec[2], lavc_param_vcodec[3]); /* FIXME!!! */ |