summaryrefslogtreecommitdiffstats
path: root/libswscale
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2009-01-23 20:56:50 +0200
committerUoti Urpala <uau@glyph.nonexistent.invalid>2009-01-23 20:56:50 +0200
commit0406d951209df261970424256d76f293649ec140 (patch)
tree622259272e33995869f234cf18f76201e5272241 /libswscale
parent79e1aa7cc7a9ac695c3af361bca72013ef272885 (diff)
parent39b7c1576d826cfd72f34a3491a094d07b3d7041 (diff)
downloadmpv-0406d951209df261970424256d76f293649ec140.tar.bz2
mpv-0406d951209df261970424256d76f293649ec140.tar.xz
Merge svn changes up to r28348
Diffstat (limited to 'libswscale')
-rw-r--r--libswscale/swscale.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/libswscale/swscale.c b/libswscale/swscale.c
index 52b709aaa0..a22bf64b71 100644
--- a/libswscale/swscale.c
+++ b/libswscale/swscale.c
@@ -458,6 +458,10 @@ const char *sws_format_name(enum PixelFormat format)
return "vdpau_mpeg1";
case PIX_FMT_VDPAU_MPEG2:
return "vdpau_mpeg2";
+ case PIX_FMT_VDPAU_WMV3:
+ return "vdpau_wmv3";
+ case PIX_FMT_VDPAU_VC1:
+ return "vdpau_vc1";
default:
return "Unknown format";
}