$OpenBSD: patch-src_arch_MovieTexture_MovieTexture_FFMpeg_h,v 1.1 2021/02/24 12:09:25 espie Exp $

Index: src/arch/MovieTexture/MovieTexture_FFMpeg.h
--- src/arch/MovieTexture/MovieTexture_FFMpeg.h.orig
+++ src/arch/MovieTexture/MovieTexture_FFMpeg.h
@@ -64,7 +64,7 @@ class MovieDecoder_FFMpeg: public MovieDecoder (privat
 
 	avcodec::AVStream *m_pStream;
 	avcodec::AVFrame *m_Frame;
-	avcodec::PixelFormat m_AVTexfmt; /* PixelFormat of output surface */
+	avcodec::AVPixelFormat m_AVTexfmt; /* PixelFormat of output surface */
 	avcodec::SwsContext *m_swsctx;
 
 	avcodec::AVFormatContext *m_fctx;
@@ -90,7 +90,7 @@ static struct AVPixelFormat_t
 {
 	int bpp;
 	uint32_t masks[4];
-	avcodec::PixelFormat pf;
+	avcodec::AVPixelFormat pf;
 	bool bHighColor;
 	bool bByteSwapOnLittleEndian;
 	MovieDecoderPixelFormatYCbCr YUV;
@@ -101,7 +101,7 @@ static struct AVPixelFormat_t
 		  0x00FF0000,
 		  0x0000FF00,
 		  0x000000FF },
-		avcodec::PIX_FMT_YUYV422,
+		avcodec::AV_PIX_FMT_YUYV422,
 		false, /* N/A */
 		true,
 		PixelFormatYCbCr_YUYV422,
@@ -112,7 +112,7 @@ static struct AVPixelFormat_t
 		  0x00FF0000,
 		  0xFF000000,
 		  0x000000FF },
-		avcodec::PIX_FMT_BGRA,
+		avcodec::AV_PIX_FMT_BGRA,
 		true,
 		true,
 		PixelFormatYCbCr_Invalid,
@@ -123,7 +123,7 @@ static struct AVPixelFormat_t
 		  0x0000FF00,
 		  0x000000FF,
 		  0xFF000000 },
-		avcodec::PIX_FMT_ARGB,
+		avcodec::AV_PIX_FMT_ARGB,
 		true,
 		true,
 		PixelFormatYCbCr_Invalid,
@@ -135,7 +135,7 @@ static struct AVPixelFormat_t
 		  0x0000FF00,
 		  0x00FF0000,
 		  0xFF000000 },
-		avcodec::PIX_FMT_ABGR,
+		avcodec::AV_PIX_FMT_ABGR,
 		true,
 		true,
 		PixelFormatYCbCr_Invalid,
@@ -146,7 +146,7 @@ static struct AVPixelFormat_t
 		  0x00FF0000,
 		  0x0000FF00,
 		  0x000000FF },
-		avcodec::PIX_FMT_RGBA,
+		avcodec::AV_PIX_FMT_RGBA,
 		true,
 		true,
 		PixelFormatYCbCr_Invalid,
@@ -157,7 +157,7 @@ static struct AVPixelFormat_t
 		  0x00FF00,
 		  0x0000FF,
 		  0x000000 },
-		avcodec::PIX_FMT_RGB24,
+		avcodec::AV_PIX_FMT_RGB24,
 		true,
 		true,
 		PixelFormatYCbCr_Invalid,
@@ -168,7 +168,7 @@ static struct AVPixelFormat_t
 		  0x00FF00,
 		  0xFF0000,
 		  0x000000 },
-		avcodec::PIX_FMT_BGR24,
+		avcodec::AV_PIX_FMT_BGR24,
 		true,
 		true,
 		PixelFormatYCbCr_Invalid,
@@ -179,12 +179,12 @@ static struct AVPixelFormat_t
 		  0x03E0,
 		  0x001F,
 		  0x0000 },
-		avcodec::PIX_FMT_RGB555,
+		avcodec::AV_PIX_FMT_RGB555,
 		false,
 		false,
 		PixelFormatYCbCr_Invalid,
 	},
-	{ 0, { 0,0,0,0 }, avcodec::PIX_FMT_NB, true, false, PixelFormatYCbCr_Invalid }
+	{ 0, { 0,0,0,0 }, avcodec::AV_PIX_FMT_NB, true, false, PixelFormatYCbCr_Invalid }
 };
 
 #endif
