Commit 2ba75ec6 authored by Ilkka Ollakka's avatar Ilkka Ollakka
Browse files

avcodec: use VLC_CODEC_

parent 7fff679f
......@@ -79,8 +79,8 @@ static const struct
{VLC_CODEC_I410, PIX_FMT_YUV410P, 0, 0, 0 },
{VLC_FOURCC('Y','V','U','9'), PIX_FMT_YUV410P, 0, 0, 0 },
{VLC_FOURCC('N','V','1','2'), PIX_FMT_NV12, 0, 0, 0 },
{VLC_FOURCC('N','V','2','1'), PIX_FMT_NV21, 0, 0, 0 },
{VLC_CODEC_NV12, PIX_FMT_NV12, 0, 0, 0 },
{VLC_CODEC_NV21, PIX_FMT_NV21, 0, 0, 0 },
{VLC_CODEC_I420_9L, PIX_FMT_YUV420P9LE, 0, 0, 0 },
{VLC_CODEC_I420_9B, PIX_FMT_YUV420P9BE, 0, 0, 0 },
......@@ -109,7 +109,7 @@ static const struct
/* Packed RGB formats */
VLC_RGB( VLC_FOURCC('R','G','B','4'), PIX_FMT_RGB4, PIX_FMT_BGR4, 0x10, 0x06, 0x01 )
VLC_RGB( VLC_FOURCC('R','G','B','8'), PIX_FMT_RGB8, PIX_FMT_BGR8, 0xC0, 0x38, 0x07 )
VLC_RGB( VLC_CODEC_RGB8, PIX_FMT_RGB8, PIX_FMT_BGR8, 0xC0, 0x38, 0x07 )
VLC_RGB( VLC_CODEC_RGB15, PIX_FMT_RGB555, PIX_FMT_BGR555, 0x7c00, 0x03e0, 0x001f )
VLC_RGB( VLC_CODEC_RGB16, PIX_FMT_RGB565, PIX_FMT_BGR565, 0xf800, 0x07e0, 0x001f )
......
......@@ -192,7 +192,7 @@ static subpicture_region_t *ConvertRegionRGBA(AVSubtitleRect *ffregion)
video_format_t fmt;
memset(&fmt, 0, sizeof(fmt));
fmt.i_chroma = VLC_FOURCC('R','G','B','A');
fmt.i_chroma = VLC_CODEC_RGBA;
fmt.i_width =
fmt.i_visible_width = ffregion->w;
fmt.i_height =
......
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