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

4680e17d · Gildas Bazin · 3970f905 · 4680e17d
Commit 4680e17d authored Nov 13, 2004 by Gildas Bazin
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

modules/codec/ffmpeg/ffmpeg.c modules/codec/ffmpeg/ffmpeg.c +3 -1

No files found.
--- 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 },