Skip to content

V
vlc-1.1
Commit 4680e17d authored by Gildas Bazin's avatar Gildas Bazin
Browse files
Options

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

parent 3970f905
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
modules/codec/ffmpeg/ffmpeg.c
View file @ 4680e17d
...@@ -350,7 +350,9 @@ static struct ...@@ -350,7 +350,9 @@ static struct
/* Packed YUV formats */ /* Packed YUV formats */
{ VLC_FOURCC('Y','U','Y','2'), PIX_FMT_YUV422 }, { 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 */ /* Packed RGB formats */
{ VLC_FOURCC('R','V','1','5'), PIX_FMT_RGB555 }, { VLC_FOURCC('R','V','1','5'), PIX_FMT_RGB555 },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment