From: Gildas Bazin <gbazin@videolan.org>
Date: Sat, 13 Nov 2004 13:09:42 +0000 (+0000)
Subject: * modules/codec/ffmpeg/ffmpeg.c: merged trunk changeset 9306 to 0.8.1 branch.
X-Git-Tag: 0.8.1~12
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=4680e17d3e81480c6d4982e66d29da387318576b;p=vlc

* modules/codec/ffmpeg/ffmpeg.c: merged trunk changeset 9306 to 0.8.1 branch.
---

diff --git a/modules/codec/ffmpeg/ffmpeg.c b/modules/codec/ffmpeg/ffmpeg.c
index b850bf3a0d..d5b65103cb 100644
--- a/modules/codec/ffmpeg/ffmpeg.c
+++ b/modules/codec/ffmpeg/ffmpeg.c
@@ -350,7 +350,9 @@ static struct
 
     /* Packed YUV formats */
     { VLC_FOURCC('Y','U','Y','2'), PIX_FMT_YUV422 },
-    { VLC_FOURCC('U','Y','V','Y'), PIX_FMT_YUV422 },
+#if LIBAVCODEC_BUILD >= 4720
+    { VLC_FOURCC('U','Y','V','Y'), PIX_FMT_UYVY422 },
+#endif
 
     /* Packed RGB formats */
     { VLC_FOURCC('R','V','1','5'), PIX_FMT_RGB555 },