diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-11-16 04:18:13 +0200 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-11-16 04:18:13 +0200 |
commit | 507f4fe6c7811558b1367e4b64855ae7f9bc8da8 (patch) | |
tree | 416b70358bf4b13871cda60fd8e8f64c5e9a2392 /fmt-conversion.c | |
parent | 8bbb79c03a594e452fb9109dd6fda781d390a798 (diff) | |
parent | b8861ce8e28080b151467827f65bdc3707a74511 (diff) | |
download | mpv-507f4fe6c7811558b1367e4b64855ae7f9bc8da8.tar.bz2 mpv-507f4fe6c7811558b1367e4b64855ae7f9bc8da8.tar.xz |
Merge branch 'vdpau'
Diffstat (limited to 'fmt-conversion.c')
-rw-r--r-- | fmt-conversion.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fmt-conversion.c b/fmt-conversion.c index 05179d1b29..06699c6ee5 100644 --- a/fmt-conversion.c +++ b/fmt-conversion.c @@ -73,6 +73,7 @@ static const struct { {IMGFMT_VDPAU_H264, PIX_FMT_VDPAU_H264}, {IMGFMT_VDPAU_WMV3, PIX_FMT_VDPAU_WMV3}, {IMGFMT_VDPAU_VC1, PIX_FMT_VDPAU_VC1}, + {IMGFMT_VDPAU_MPEG4, PIX_FMT_VDPAU_MPEG4}, {0, PIX_FMT_NONE} }; |