diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-02-16 02:39:58 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-02-16 02:39:58 +0200 |
| commit | 0bf2bd91ec69dfd908d78557a17f38e0904a52e7 (patch) | |
| tree | bf9e5e145ff802e7b5ff7b9ab387bfc3ba0331d7 /codec-cfg.c | |
| parent | 738f66b1bc98073d74af7031c4454322157a15ec (diff) | |
| parent | eacf4421f4fe16674aefe8b628321188c4912521 (diff) | |
| download | mpv-0bf2bd91ec69dfd908d78557a17f38e0904a52e7.tar.bz2 mpv-0bf2bd91ec69dfd908d78557a17f38e0904a52e7.tar.xz | |
Merge svn changes up to r28610
Diffstat (limited to 'codec-cfg.c')
| -rw-r--r-- | codec-cfg.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/codec-cfg.c b/codec-cfg.c index 5e7847db40..56dae05c45 100644 --- a/codec-cfg.c +++ b/codec-cfg.c @@ -184,6 +184,12 @@ static int add_to_format(char *s, char *alias,unsigned int *fourcc, unsigned int {"IDCT_MPEG2",IMGFMT_XVMC_IDCT_MPEG2}, {"MOCO_MPEG2",IMGFMT_XVMC_MOCO_MPEG2}, + {"VDPAU_MPEG1",IMGFMT_VDPAU_MPEG1}, + {"VDPAU_MPEG2",IMGFMT_VDPAU_MPEG2}, + {"VDPAU_H264",IMGFMT_VDPAU_H264}, + {"VDPAU_WMV3",IMGFMT_VDPAU_WMV3}, + {"VDPAU_VC1",IMGFMT_VDPAU_VC1}, + {NULL, 0} }; |