Use AV_PIX_FMT_* instead of the deprecated PIX_FMT_*

6 files changed, 178 insertions, 178 deletions

diff --git a/decoder/LAVVideo/Filtering.cpp b/decoder/LAVVideo/Filtering.cpp
index de92eed2..047381c9 100644
--- a/decoder/LAVVideo/Filtering.cpp
+++ b/decoder/LAVVideo/Filtering.cpp
@@ -43,7 +43,7 @@ HRESULT CLAVVideo::Filter(LAVFrame *pFrame)
   int ret = 0;
   BOOL bFlush = pFrame->flags & LAV_FRAME_FLAG_FLUSH;
   if (m_Decoder.IsInterlaced() && m_settings.DeintMode != DeintMode_Disable && m_settings.SWDeintMode == SWDeintMode_YADIF && ((bFlush && m_pFilterGraph) || pFrame->format == LAVPixFmt_YUV420 || pFrame->format == LAVPixFmt_YUV422 || pFrame->format == LAVPixFmt_NV12)) {
-    PixelFormat ff_pixfmt = (pFrame->format == LAVPixFmt_YUV420) ? PIX_FMT_YUV420P : (pFrame->format == LAVPixFmt_YUV422) ? PIX_FMT_YUV422P : PIX_FMT_NV12;
+    PixelFormat ff_pixfmt = (pFrame->format == LAVPixFmt_YUV420) ? AV_PIX_FMT_YUV420P : (pFrame->format == LAVPixFmt_YUV422) ? AV_PIX_FMT_YUV422P : AV_PIX_FMT_NV12;
 
     if (!bFlush && (!m_pFilterGraph || pFrame->format != m_filterPixFmt || pFrame->width != m_filterWidth || pFrame->height != m_filterHeight)) {
       DbgLog((LOG_TRACE, 10, L":Filter()(init) Initializing YADIF deinterlacing filter..."));
@@ -60,14 +60,14 @@ HRESULT CLAVVideo::Filter(LAVFrame *pFrame)
       char args[512];
       enum PixelFormat pix_fmts[3];
 
-      if (ff_pixfmt == PIX_FMT_NV12) {
-        pix_fmts[0] = PIX_FMT_NV12;
-        pix_fmts[1] = PIX_FMT_YUV420P;
+      if (ff_pixfmt == AV_PIX_FMT_NV12) {
+        pix_fmts[0] = AV_PIX_FMT_NV12;
+        pix_fmts[1] = AV_PIX_FMT_YUV420P;
       } else {
         pix_fmts[0] = ff_pixfmt;
-        pix_fmts[1] = PIX_FMT_NONE;
+        pix_fmts[1] = AV_PIX_FMT_NONE;
       }
-      pix_fmts[2] = PIX_FMT_NONE;
+      pix_fmts[2] = AV_PIX_FMT_NONE;
 
       AVFilter *buffersrc  = avfilter_get_by_name("buffer");
       AVFilter *buffersink = avfilter_get_by_name("buffersink");
@@ -145,7 +145,7 @@ HRESULT CLAVVideo::Filter(LAVFrame *pFrame)
       if (refcountedFrame) {
         AVBufferRef *pFrameBuf = av_buffer_create(NULL, 0, lav_free_lavframe, pFrame, 0);
         const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get((AVPixelFormat)in_frame->format);
-        int planes = (in_frame->format == PIX_FMT_NV12) ? 2 : desc->nb_components;
+        int planes = (in_frame->format == AV_PIX_FMT_NV12) ? 2 : desc->nb_components;
 
         for (int i = 0; i < planes; i++) {
           int h_shift    = (i == 1 || i == 2) ? desc->log2_chroma_h : 0;
@@ -182,7 +182,7 @@ HRESULT CLAVVideo::Filter(LAVFrame *pFrame)
         rtDuration >>= 1;
 
       // Copy most settings over
-      outFrame->format       = (out_frame->format == PIX_FMT_YUV420P) ? LAVPixFmt_YUV420 : (out_frame->format == PIX_FMT_YUV422P) ? LAVPixFmt_YUV422 : LAVPixFmt_NV12;
+      outFrame->format       = (out_frame->format == AV_PIX_FMT_YUV420P) ? LAVPixFmt_YUV420 : (out_frame->format == AV_PIX_FMT_YUV422P) ? LAVPixFmt_YUV422 : LAVPixFmt_NV12;
       outFrame->bpp          = pFrame->bpp;
       outFrame->ext_format   = pFrame->ext_format;
       outFrame->avgFrameDuration = pFrame->avgFrameDuration;
diff --git a/decoder/LAVVideo/decoders/avcodec.cpp b/decoder/LAVVideo/decoders/avcodec.cpp
index 965deff5..43e78f05 100644
--- a/decoder/LAVVideo/decoders/avcodec.cpp
+++ b/decoder/LAVVideo/decoders/avcodec.cpp
@@ -105,7 +105,7 @@ static DXVA2_ExtendedFormat GetDXVA2ExtendedFlags(AVCodecContext *ctx, AVFrame *
   }
 
   // Color Range, 0-255 or 16-235
-  BOOL ffFullRange = (ctx->color_range == AVCOL_RANGE_JPEG) || frame->format == PIX_FMT_YUVJ420P || frame->format == PIX_FMT_YUVJ422P || frame->format == PIX_FMT_YUVJ444P || frame->format == PIX_FMT_YUVJ440P;
+  BOOL ffFullRange = (ctx->color_range == AVCOL_RANGE_JPEG) || frame->format == AV_PIX_FMT_YUVJ420P || frame->format == AV_PIX_FMT_YUVJ422P || frame->format == AV_PIX_FMT_YUVJ444P || frame->format == AV_PIX_FMT_YUVJ440P;
   fmt.NominalRange = ffFullRange ? DXVA2_NominalRange_0_255 : (ctx->color_range == AVCOL_RANGE_MPEG) ? DXVA2_NominalRange_16_235 : DXVA2_NominalRange_Unknown;
 
   return fmt;
@@ -123,121 +123,121 @@ static struct PixelFormatMapping {
   BOOL           conversion;
   int            bpp;
 } ff_pix_map[] = {
-  { PIX_FMT_YUV420P,   LAVPixFmt_YUV420, FALSE },
-  { PIX_FMT_YUYV422,   LAVPixFmt_YUY2,   FALSE },
-  { PIX_FMT_RGB24,     LAVPixFmt_RGB32,  TRUE  },
-  { PIX_FMT_BGR24,     LAVPixFmt_RGB24,  FALSE },
-  { PIX_FMT_YUV422P,   LAVPixFmt_YUV422, FALSE },
-  { PIX_FMT_YUV444P,   LAVPixFmt_YUV444, FALSE },
-  { PIX_FMT_YUV410P,   LAVPixFmt_YUV420, TRUE  },
-  { PIX_FMT_YUV411P,   LAVPixFmt_YUV422, TRUE  },
-  { PIX_FMT_GRAY8,     LAVPixFmt_YUV420, TRUE  },
-  { PIX_FMT_MONOWHITE, LAVPixFmt_YUV420, TRUE  },
-  { PIX_FMT_MONOBLACK, LAVPixFmt_YUV420, TRUE  },
-  { PIX_FMT_PAL8,      LAVPixFmt_RGB32,  TRUE  },
-  { PIX_FMT_YUVJ420P,  LAVPixFmt_YUV420, FALSE },
-  { PIX_FMT_YUVJ422P,  LAVPixFmt_YUV422, FALSE },
-  { PIX_FMT_YUVJ444P,  LAVPixFmt_YUV444, FALSE },
-  { PIX_FMT_UYVY422,   LAVPixFmt_YUV422, TRUE  },
-  { PIX_FMT_UYYVYY411, LAVPixFmt_YUV422, TRUE  },
-  { PIX_FMT_BGR8,      LAVPixFmt_RGB32,  TRUE  },
-  { PIX_FMT_BGR4,      LAVPixFmt_RGB32,  TRUE  },
-  { PIX_FMT_BGR4_BYTE, LAVPixFmt_RGB32,  TRUE  },
-  { PIX_FMT_RGB8,      LAVPixFmt_RGB32,  TRUE  },
-  { PIX_FMT_RGB4,      LAVPixFmt_RGB32,  TRUE  },
-  { PIX_FMT_RGB4_BYTE, LAVPixFmt_RGB32,  TRUE  },
-  { PIX_FMT_NV12,      LAVPixFmt_NV12,   FALSE },
-  { PIX_FMT_NV21,      LAVPixFmt_NV12,   TRUE  },
-
-  { PIX_FMT_ARGB,      LAVPixFmt_ARGB32, TRUE  },
-  { PIX_FMT_RGBA,      LAVPixFmt_ARGB32, TRUE  },
-  { PIX_FMT_ABGR,      LAVPixFmt_ARGB32, TRUE  },
-  { PIX_FMT_BGRA,      LAVPixFmt_ARGB32, FALSE },
-
-  { PIX_FMT_GRAY16BE,  LAVPixFmt_YUV420, TRUE  },
-  { PIX_FMT_GRAY16LE,  LAVPixFmt_YUV420, TRUE  },
-  { PIX_FMT_YUV440P,   LAVPixFmt_YUV444, TRUE  },
-  { PIX_FMT_YUVJ440P,  LAVPixFmt_YUV444, TRUE  },
-  { PIX_FMT_YUVA420P,  LAVPixFmt_YUV420, TRUE  },
-  { PIX_FMT_RGB48BE,   LAVPixFmt_RGB48,  TRUE  },
-  { PIX_FMT_RGB48LE,   LAVPixFmt_RGB48,  TRUE  },
-
-  { PIX_FMT_RGB565BE,  LAVPixFmt_RGB32,  TRUE  },
-  { PIX_FMT_RGB565LE,  LAVPixFmt_RGB32,  TRUE  },
-  { PIX_FMT_RGB555BE,  LAVPixFmt_RGB32,  TRUE  },
-  { PIX_FMT_RGB555LE,  LAVPixFmt_RGB32,  TRUE  },
-
-  { PIX_FMT_BGR565BE,  LAVPixFmt_RGB32,  TRUE  },
-  { PIX_FMT_BGR565LE,  LAVPixFmt_RGB32,  TRUE  },
-  { PIX_FMT_BGR555BE,  LAVPixFmt_RGB32,  TRUE  },
-  { PIX_FMT_BGR555LE,  LAVPixFmt_RGB32,  TRUE  },
-
-  { PIX_FMT_YUV420P16LE, LAVPixFmt_YUV420bX, FALSE, 16 },
-  { PIX_FMT_YUV420P16BE, LAVPixFmt_YUV420bX, TRUE,  16 },
-  { PIX_FMT_YUV422P16LE, LAVPixFmt_YUV422bX, FALSE, 16 },
-  { PIX_FMT_YUV422P16BE, LAVPixFmt_YUV422bX, TRUE,  16 },
-  { PIX_FMT_YUV444P16LE, LAVPixFmt_YUV444bX, FALSE, 16 },
-  { PIX_FMT_YUV444P16BE, LAVPixFmt_YUV444bX, TRUE,  16 },
-
-  { PIX_FMT_RGB444LE,  LAVPixFmt_RGB32,  TRUE  },
-  { PIX_FMT_RGB444BE,  LAVPixFmt_RGB32,  TRUE  },
-  { PIX_FMT_BGR444LE,  LAVPixFmt_RGB32,  TRUE  },
-  { PIX_FMT_BGR444BE,  LAVPixFmt_RGB32,  TRUE  },
-  { PIX_FMT_GRAY8A,    LAVPixFmt_YUV420, TRUE  },
-  { PIX_FMT_BGR48BE,   LAVPixFmt_RGB48,  TRUE  },
-  { PIX_FMT_BGR48LE,   LAVPixFmt_RGB48,  FALSE },
-
-  { PIX_FMT_YUV420P9BE,  LAVPixFmt_YUV420bX, TRUE,  9 },
-  { PIX_FMT_YUV420P9LE,  LAVPixFmt_YUV420bX, FALSE, 9 },
-  { PIX_FMT_YUV420P10BE, LAVPixFmt_YUV420bX, TRUE,  10 },
-  { PIX_FMT_YUV420P10LE, LAVPixFmt_YUV420bX, FALSE, 10 },
-  { PIX_FMT_YUV422P10BE, LAVPixFmt_YUV422bX, TRUE,  10 },
-  { PIX_FMT_YUV422P10LE, LAVPixFmt_YUV422bX, FALSE, 10 },
-  { PIX_FMT_YUV444P9BE,  LAVPixFmt_YUV444bX, TRUE,  9 },
-  { PIX_FMT_YUV444P9LE,  LAVPixFmt_YUV444bX, FALSE, 9 },
-  { PIX_FMT_YUV444P10BE, LAVPixFmt_YUV444bX, TRUE,  10 },
-  { PIX_FMT_YUV444P10LE, LAVPixFmt_YUV444bX, FALSE, 10 },
-  { PIX_FMT_YUV422P9BE,  LAVPixFmt_YUV422bX, TRUE,  9 },
-  { PIX_FMT_YUV422P9LE,  LAVPixFmt_YUV422bX, FALSE, 9 },
-
-  { PIX_FMT_GBRP,      LAVPixFmt_RGB32,  TRUE  },
-  { PIX_FMT_GBRP9BE,   LAVPixFmt_RGB48,  TRUE  },
-  { PIX_FMT_GBRP9LE,   LAVPixFmt_RGB48,  TRUE  },
-  { PIX_FMT_GBRP10BE,  LAVPixFmt_RGB48,  TRUE  },
-  { PIX_FMT_GBRP10LE,  LAVPixFmt_RGB48,  TRUE  },
-  { PIX_FMT_GBRP16BE,  LAVPixFmt_RGB48,  TRUE  },
-  { PIX_FMT_GBRP16LE,  LAVPixFmt_RGB48,  TRUE  },
-
-  { PIX_FMT_RGBA64BE,  LAVPixFmt_RGB48,  TRUE  },
-  { PIX_FMT_RGBA64LE,  LAVPixFmt_RGB48,  TRUE  },
-  { PIX_FMT_BGRA64BE,  LAVPixFmt_RGB48,  TRUE  },
-  { PIX_FMT_BGRA64LE,  LAVPixFmt_RGB48,  TRUE  },
-
-  { PIX_FMT_0RGB,      LAVPixFmt_RGB32,  TRUE  },
-  { PIX_FMT_RGB0,      LAVPixFmt_RGB32,  TRUE  },
-  { PIX_FMT_0BGR,      LAVPixFmt_RGB32,  TRUE  },
-  { PIX_FMT_BGR0,      LAVPixFmt_RGB32,  FALSE },
-  { PIX_FMT_YUVA444P,  LAVPixFmt_YUV444, TRUE  },
-  { PIX_FMT_YUVA422P,  LAVPixFmt_YUV422, TRUE  },
-
-  { PIX_FMT_YUV420P12BE, LAVPixFmt_YUV420bX, TRUE,  12 },
-  { PIX_FMT_YUV420P12LE, LAVPixFmt_YUV420bX, FALSE, 12 },
-  { PIX_FMT_YUV420P14BE, LAVPixFmt_YUV420bX, TRUE,  14 },
-  { PIX_FMT_YUV420P14LE, LAVPixFmt_YUV420bX, FALSE, 14 },
-  { PIX_FMT_YUV422P12BE, LAVPixFmt_YUV422bX, TRUE,  12 },
-  { PIX_FMT_YUV422P12LE, LAVPixFmt_YUV422bX, FALSE, 12 },
-  { PIX_FMT_YUV422P14BE, LAVPixFmt_YUV422bX, TRUE,  14 },
-  { PIX_FMT_YUV422P14LE, LAVPixFmt_YUV422bX, FALSE, 14 },
-  { PIX_FMT_YUV444P12BE, LAVPixFmt_YUV444bX, TRUE,  12 },
-  { PIX_FMT_YUV444P12LE, LAVPixFmt_YUV444bX, FALSE, 12 },
-  { PIX_FMT_YUV444P14BE, LAVPixFmt_YUV444bX, TRUE,  14 },
-  { PIX_FMT_YUV444P14LE, LAVPixFmt_YUV444bX, FALSE, 14 },
-  { PIX_FMT_GBRP12BE, LAVPixFmt_RGB48, TRUE },
-  { PIX_FMT_GBRP12LE, LAVPixFmt_RGB48, TRUE },
-  { PIX_FMT_GBRP14BE, LAVPixFmt_RGB48, TRUE },
-  { PIX_FMT_GBRP14LE, LAVPixFmt_RGB48, TRUE },
-
-  { PIX_FMT_DXVA2_VLD, LAVPixFmt_DXVA2, FALSE },
+  { AV_PIX_FMT_YUV420P,   LAVPixFmt_YUV420, FALSE },
+  { AV_PIX_FMT_YUYV422,   LAVPixFmt_YUY2,   FALSE },
+  { AV_PIX_FMT_RGB24,     LAVPixFmt_RGB32,  TRUE  },
+  { AV_PIX_FMT_BGR24,     LAVPixFmt_RGB24,  FALSE },
+  { AV_PIX_FMT_YUV422P,   LAVPixFmt_YUV422, FALSE },
+  { AV_PIX_FMT_YUV444P,   LAVPixFmt_YUV444, FALSE },
+  { AV_PIX_FMT_YUV410P,   LAVPixFmt_YUV420, TRUE  },
+  { AV_PIX_FMT_YUV411P,   LAVPixFmt_YUV422, TRUE  },
+  { AV_PIX_FMT_GRAY8,     LAVPixFmt_YUV420, TRUE  },
+  { AV_PIX_FMT_MONOWHITE, LAVPixFmt_YUV420, TRUE  },
+  { AV_PIX_FMT_MONOBLACK, LAVPixFmt_YUV420, TRUE  },
+  { AV_PIX_FMT_PAL8,      LAVPixFmt_RGB32,  TRUE  },
+  { AV_PIX_FMT_YUVJ420P,  LAVPixFmt_YUV420, FALSE },
+  { AV_PIX_FMT_YUVJ422P,  LAVPixFmt_YUV422, FALSE },
+  { AV_PIX_FMT_YUVJ444P,  LAVPixFmt_YUV444, FALSE },
+  { AV_PIX_FMT_UYVY422,   LAVPixFmt_YUV422, TRUE  },
+  { AV_PIX_FMT_UYYVYY411, LAVPixFmt_YUV422, TRUE  },
+  { AV_PIX_FMT_BGR8,      LAVPixFmt_RGB32,  TRUE  },
+  { AV_PIX_FMT_BGR4,      LAVPixFmt_RGB32,  TRUE  },
+  { AV_PIX_FMT_BGR4_BYTE, LAVPixFmt_RGB32,  TRUE  },
+  { AV_PIX_FMT_RGB8,      LAVPixFmt_RGB32,  TRUE  },
+  { AV_PIX_FMT_RGB4,      LAVPixFmt_RGB32,  TRUE  },
+  { AV_PIX_FMT_RGB4_BYTE, LAVPixFmt_RGB32,  TRUE  },
+  { AV_PIX_FMT_NV12,      LAVPixFmt_NV12,   FALSE },
+  { AV_PIX_FMT_NV21,      LAVPixFmt_NV12,   TRUE  },
+
+  { AV_PIX_FMT_ARGB,      LAVPixFmt_ARGB32, TRUE  },
+  { AV_PIX_FMT_RGBA,      LAVPixFmt_ARGB32, TRUE  },
+  { AV_PIX_FMT_ABGR,      LAVPixFmt_ARGB32, TRUE  },
+  { AV_PIX_FMT_BGRA,      LAVPixFmt_ARGB32, FALSE },
+
+  { AV_PIX_FMT_GRAY16BE,  LAVPixFmt_YUV420, TRUE  },
+  { AV_PIX_FMT_GRAY16LE,  LAVPixFmt_YUV420, TRUE  },
+  { AV_PIX_FMT_YUV440P,   LAVPixFmt_YUV444, TRUE  },
+  { AV_PIX_FMT_YUVJ440P,  LAVPixFmt_YUV444, TRUE  },
+  { AV_PIX_FMT_YUVA420P,  LAVPixFmt_YUV420, TRUE  },
+  { AV_PIX_FMT_RGB48BE,   LAVPixFmt_RGB48,  TRUE  },
+  { AV_PIX_FMT_RGB48LE,   LAVPixFmt_RGB48,  TRUE  },
+
+  { AV_PIX_FMT_RGB565BE,  LAVPixFmt_RGB32,  TRUE  },
+  { AV_PIX_FMT_RGB565LE,  LAVPixFmt_RGB32,  TRUE  },
+  { AV_PIX_FMT_RGB555BE,  LAVPixFmt_RGB32,  TRUE  },
+  { AV_PIX_FMT_RGB555LE,  LAVPixFmt_RGB32,  TRUE  },
+
+  { AV_PIX_FMT_BGR565BE,  LAVPixFmt_RGB32,  TRUE  },
+  { AV_PIX_FMT_BGR565LE,  LAVPixFmt_RGB32,  TRUE  },
+  { AV_PIX_FMT_BGR555BE,  LAVPixFmt_RGB32,  TRUE  },
+  { AV_PIX_FMT_BGR555LE,  LAVPixFmt_RGB32,  TRUE  },
+
+  { AV_PIX_FMT_YUV420P16LE, LAVPixFmt_YUV420bX, FALSE, 16 },
+  { AV_PIX_FMT_YUV420P16BE, LAVPixFmt_YUV420bX, TRUE,  16 },
+  { AV_PIX_FMT_YUV422P16LE, LAVPixFmt_YUV422bX, FALSE, 16 },
+  { AV_PIX_FMT_YUV422P16BE, LAVPixFmt_YUV422bX, TRUE,  16 },
+  { AV_PIX_FMT_YUV444P16LE, LAVPixFmt_YUV444bX, FALSE, 16 },
+  { AV_PIX_FMT_YUV444P16BE, LAVPixFmt_YUV444bX, TRUE,  16 },
+
+  { AV_PIX_FMT_RGB444LE,  LAVPixFmt_RGB32,  TRUE  },
+  { AV_PIX_FMT_RGB444BE,  LAVPixFmt_RGB32,  TRUE  },
+  { AV_PIX_FMT_BGR444LE,  LAVPixFmt_RGB32,  TRUE  },
+  { AV_PIX_FMT_BGR444BE,  LAVPixFmt_RGB32,  TRUE  },
+  { AV_PIX_FMT_GRAY8A,    LAVPixFmt_YUV420, TRUE  },
+  { AV_PIX_FMT_BGR48BE,   LAVPixFmt_RGB48,  TRUE  },
+  { AV_PIX_FMT_BGR48LE,   LAVPixFmt_RGB48,  FALSE },
+
+  { AV_PIX_FMT_YUV420P9BE,  LAVPixFmt_YUV420bX, TRUE,  9 },
+  { AV_PIX_FMT_YUV420P9LE,  LAVPixFmt_YUV420bX, FALSE, 9 },
+  { AV_PIX_FMT_YUV420P10BE, LAVPixFmt_YUV420bX, TRUE,  10 },
+  { AV_PIX_FMT_YUV420P10LE, LAVPixFmt_YUV420bX, FALSE, 10 },
+  { AV_PIX_FMT_YUV422P10BE, LAVPixFmt_YUV422bX, TRUE,  10 },
+  { AV_PIX_FMT_YUV422P10LE, LAVPixFmt_YUV422bX, FALSE, 10 },
+  { AV_PIX_FMT_YUV444P9BE,  LAVPixFmt_YUV444bX, TRUE,  9 },
+  { AV_PIX_FMT_YUV444P9LE,  LAVPixFmt_YUV444bX, FALSE, 9 },
+  { AV_PIX_FMT_YUV444P10BE, LAVPixFmt_YUV444bX, TRUE,  10 },
+  { AV_PIX_FMT_YUV444P10LE, LAVPixFmt_YUV444bX, FALSE, 10 },
+  { AV_PIX_FMT_YUV422P9BE,  LAVPixFmt_YUV422bX, TRUE,  9 },
+  { AV_PIX_FMT_YUV422P9LE,  LAVPixFmt_YUV422bX, FALSE, 9 },
+
+  { AV_PIX_FMT_GBRP,      LAVPixFmt_RGB32,  TRUE  },
+  { AV_PIX_FMT_GBRP9BE,   LAVPixFmt_RGB48,  TRUE  },
+  { AV_PIX_FMT_GBRP9LE,   LAVPixFmt_RGB48,  TRUE  },
+  { AV_PIX_FMT_GBRP10BE,  LAVPixFmt_RGB48,  TRUE  },
+  { AV_PIX_FMT_GBRP10LE,  LAVPixFmt_RGB48,  TRUE  },
+  { AV_PIX_FMT_GBRP16BE,  LAVPixFmt_RGB48,  TRUE  },
+  { AV_PIX_FMT_GBRP16LE,  LAVPixFmt_RGB48,  TRUE  },
+
+  { AV_PIX_FMT_RGBA64BE,  LAVPixFmt_RGB48,  TRUE  },
+  { AV_PIX_FMT_RGBA64LE,  LAVPixFmt_RGB48,  TRUE  },
+  { AV_PIX_FMT_BGRA64BE,  LAVPixFmt_RGB48,  TRUE  },
+  { AV_PIX_FMT_BGRA64LE,  LAVPixFmt_RGB48,  TRUE  },
+
+  { AV_PIX_FMT_0RGB,      LAVPixFmt_RGB32,  TRUE  },
+  { AV_PIX_FMT_RGB0,      LAVPixFmt_RGB32,  TRUE  },
+  { AV_PIX_FMT_0BGR,      LAVPixFmt_RGB32,  TRUE  },
+  { AV_PIX_FMT_BGR0,      LAVPixFmt_RGB32,  FALSE },
+  { AV_PIX_FMT_YUVA444P,  LAVPixFmt_YUV444, TRUE  },
+  { AV_PIX_FMT_YUVA422P,  LAVPixFmt_YUV422, TRUE  },
+
+  { AV_PIX_FMT_YUV420P12BE, LAVPixFmt_YUV420bX, TRUE,  12 },
+  { AV_PIX_FMT_YUV420P12LE, LAVPixFmt_YUV420bX, FALSE, 12 },
+  { AV_PIX_FMT_YUV420P14BE, LAVPixFmt_YUV420bX, TRUE,  14 },
+  { AV_PIX_FMT_YUV420P14LE, LAVPixFmt_YUV420bX, FALSE, 14 },
+  { AV_PIX_FMT_YUV422P12BE, LAVPixFmt_YUV422bX, TRUE,  12 },
+  { AV_PIX_FMT_YUV422P12LE, LAVPixFmt_YUV422bX, FALSE, 12 },
+  { AV_PIX_FMT_YUV422P14BE, LAVPixFmt_YUV422bX, TRUE,  14 },
+  { AV_PIX_FMT_YUV422P14LE, LAVPixFmt_YUV422bX, FALSE, 14 },
+  { AV_PIX_FMT_YUV444P12BE, LAVPixFmt_YUV444bX, TRUE,  12 },
+  { AV_PIX_FMT_YUV444P12LE, LAVPixFmt_YUV444bX, FALSE, 12 },
+  { AV_PIX_FMT_YUV444P14BE, LAVPixFmt_YUV444bX, TRUE,  14 },
+  { AV_PIX_FMT_YUV444P14LE, LAVPixFmt_YUV444bX, FALSE, 14 },
+  { AV_PIX_FMT_GBRP12BE, LAVPixFmt_RGB48, TRUE },
+  { AV_PIX_FMT_GBRP12LE, LAVPixFmt_RGB48, TRUE },
+  { AV_PIX_FMT_GBRP14BE, LAVPixFmt_RGB48, TRUE },
+  { AV_PIX_FMT_GBRP14LE, LAVPixFmt_RGB48, TRUE },
+
+  { AV_PIX_FMT_DXVA2_VLD, LAVPixFmt_DXVA2, FALSE },
 };
 
 static AVCodecID ff_interlace_capable[] = {
@@ -565,9 +565,9 @@ STDMETHODIMP CDecAvcodec::InitDecoder(AVCodecID codec, const CMediaType *pmt)
       CMPEG2HeaderParser mpeg2Parser(extra, extralen);
       if (mpeg2Parser.hdr.valid) {
         if (mpeg2Parser.hdr.chroma < 2) {
-          m_pAVCtx->pix_fmt = PIX_FMT_YUV420P;
+          m_pAVCtx->pix_fmt = AV_PIX_FMT_YUV420P;
         } else if (mpeg2Parser.hdr.chroma == 2) {
-          m_pAVCtx->pix_fmt = PIX_FMT_YUV422P;
+          m_pAVCtx->pix_fmt = AV_PIX_FMT_YUV422P;
         }
         m_iInterlaced = mpeg2Parser.hdr.interlaced;
       }
@@ -587,9 +587,9 @@ STDMETHODIMP CDecAvcodec::InitDecoder(AVCodecID codec, const CMediaType *pmt)
   }
 
   if (codec == AV_CODEC_ID_DNXHD)
-    m_pAVCtx->pix_fmt = PIX_FMT_YUV422P10;
+    m_pAVCtx->pix_fmt = AV_PIX_FMT_YUV422P10;
   else if (codec == AV_CODEC_ID_FRAPS)
-    m_pAVCtx->pix_fmt = PIX_FMT_BGR24;
+    m_pAVCtx->pix_fmt = AV_PIX_FMT_BGR24;
 
   if (bLAVInfoValid && codec != AV_CODEC_ID_FRAPS && m_pAVCtx->pix_fmt != AV_PIX_FMT_DXVA2_VLD)
     m_pAVCtx->pix_fmt = lavPinInfo.pix_fmt;
@@ -988,7 +988,7 @@ STDMETHODIMP CDecAvcodec::EndOfStream()
 
 STDMETHODIMP CDecAvcodec::GetPixelFormat(LAVPixelFormat *pPix, int *pBpp)
 {
-  PixelFormat pixfmt = m_pAVCtx ? m_pAVCtx->pix_fmt : PIX_FMT_NONE;
+  PixelFormat pixfmt = m_pAVCtx ? m_pAVCtx->pix_fmt : AV_PIX_FMT_NONE;
   PixelFormatMapping mapping = getPixFmtMapping(pixfmt);
   if (pPix)
     *pPix = mapping.lavpixfmt;
diff --git a/decoder/LAVVideo/decoders/dxva2dec.cpp b/decoder/LAVVideo/decoders/dxva2dec.cpp
index 460304bf..97a48300 100644
--- a/decoder/LAVVideo/decoders/dxva2dec.cpp
+++ b/decoder/LAVVideo/decoders/dxva2dec.cpp
@@ -831,7 +831,7 @@ STDMETHODIMP CDecDXVA2::InitDecoder(AVCodecID codec, const CMediaType *pmt)
     return hr;
   }
 
-  if (((codec == AV_CODEC_ID_H264 || codec == AV_CODEC_ID_MPEG2VIDEO) && m_pAVCtx->pix_fmt != PIX_FMT_YUV420P && m_pAVCtx->pix_fmt != PIX_FMT_YUVJ420P && m_pAVCtx->pix_fmt != PIX_FMT_DXVA2_VLD && m_pAVCtx->pix_fmt != PIX_FMT_NONE)
+  if (((codec == AV_CODEC_ID_H264 || codec == AV_CODEC_ID_MPEG2VIDEO) && m_pAVCtx->pix_fmt != AV_PIX_FMT_YUV420P && m_pAVCtx->pix_fmt != AV_PIX_FMT_YUVJ420P && m_pAVCtx->pix_fmt != AV_PIX_FMT_DXVA2_VLD && m_pAVCtx->pix_fmt != AV_PIX_FMT_NONE)
     || (codec == AV_CODEC_ID_H264 && m_pAVCtx->profile != FF_PROFILE_UNKNOWN && !H264_CHECK_PROFILE(m_pAVCtx->profile))) {
     DbgLog((LOG_TRACE, 10, L"-> Incompatible profile detected, falling back to software decoding"));
     return E_FAIL;
@@ -989,7 +989,7 @@ HRESULT CDecDXVA2::CreateDXVA2Decoder(int nSurfaces, IDirect3DSurface9 **ppSurfa
 
 static enum PixelFormat get_dxva2_format(struct AVCodecContext *s, const enum PixelFormat * fmt)
 {
-  while (*fmt != PIX_FMT_NONE && *fmt != PIX_FMT_DXVA2_VLD) {
+  while (*fmt != AV_PIX_FMT_NONE && *fmt != AV_PIX_FMT_DXVA2_VLD) {
     ++fmt;
   }
   return fmt[0];
@@ -1024,7 +1024,7 @@ int CDecDXVA2::get_dxva2_buffer(struct AVCodecContext *c, AVFrame *pic, int flag
 
   HRESULT hr = S_OK;
 
-  if (pic->format != PIX_FMT_DXVA2_VLD || (c->codec_id == AV_CODEC_ID_H264 && !H264_CHECK_PROFILE(c->profile))) {
+  if (pic->format != AV_PIX_FMT_DXVA2_VLD || (c->codec_id == AV_CODEC_ID_H264 && !H264_CHECK_PROFILE(c->profile))) {
     DbgLog((LOG_ERROR, 10, L"DXVA2 buffer request, but not dxva2 pixfmt or unsupported profile"));
     pDec->m_bFailHWDecode = TRUE;
     return -1;
diff --git a/decoder/LAVVideo/decoders/pixfmt.cpp b/decoder/LAVVideo/decoders/pixfmt.cpp
index 83c49293..0c902755 100644
--- a/decoder/LAVVideo/decoders/pixfmt.cpp
+++ b/decoder/LAVVideo/decoders/pixfmt.cpp
@@ -44,36 +44,36 @@ static struct {
   LAVPixelFormat pixfmt;
   PixelFormat ffpixfmt;
 } lav_ff_pixfmt_map[] = {
-  { LAVPixFmt_YUV420, PIX_FMT_YUV420P },
-  { LAVPixFmt_YUV422, PIX_FMT_YUV422P },
-  { LAVPixFmt_YUV444, PIX_FMT_YUV444P },
-  { LAVPixFmt_NV12,   PIX_FMT_NV12    },
-  { LAVPixFmt_YUY2,   PIX_FMT_YUYV422 },
-  { LAVPixFmt_RGB24,  PIX_FMT_BGR24   },
-  { LAVPixFmt_RGB32,  PIX_FMT_BGRA    },
-  { LAVPixFmt_ARGB32, PIX_FMT_BGRA    },
-  { LAVPixFmt_RGB48,  PIX_FMT_BGR48LE },
+  { LAVPixFmt_YUV420, AV_PIX_FMT_YUV420P },
+  { LAVPixFmt_YUV422, AV_PIX_FMT_YUV422P },
+  { LAVPixFmt_YUV444, AV_PIX_FMT_YUV444P },
+  { LAVPixFmt_NV12,   AV_PIX_FMT_NV12    },
+  { LAVPixFmt_YUY2,   AV_PIX_FMT_YUYV422 },
+  { LAVPixFmt_RGB24,  AV_PIX_FMT_BGR24   },
+  { LAVPixFmt_RGB32,  AV_PIX_FMT_BGRA    },
+  { LAVPixFmt_ARGB32, AV_PIX_FMT_BGRA    },
+  { LAVPixFmt_RGB48,  AV_PIX_FMT_BGR48LE },
 };
 
 PixelFormat getFFPixelFormatFromLAV(LAVPixelFormat pixFmt, int bpp)
 {
-  PixelFormat fmt = PIX_FMT_NONE;
+  PixelFormat fmt = AV_PIX_FMT_NONE;
   for(int i = 0; i < countof(lav_ff_pixfmt_map); i++) {
     if (lav_ff_pixfmt_map[i].pixfmt == pixFmt) {
       fmt = lav_ff_pixfmt_map[i].ffpixfmt;
       break;
     }
   }
-  if (fmt == PIX_FMT_NONE) {
+  if (fmt == AV_PIX_FMT_NONE) {
     switch(pixFmt) {
     case LAVPixFmt_YUV420bX:
-      fmt = (bpp == 9) ? PIX_FMT_YUV420P9LE : ((bpp == 10) ? PIX_FMT_YUV420P10LE : ((bpp == 12) ? PIX_FMT_YUV420P12LE : ((bpp == 14) ? PIX_FMT_YUV420P14LE : PIX_FMT_YUV420P16LE)));
+      fmt = (bpp == 9) ? AV_PIX_FMT_YUV420P9LE : ((bpp == 10) ? AV_PIX_FMT_YUV420P10LE : ((bpp == 12) ? AV_PIX_FMT_YUV420P12LE : ((bpp == 14) ? AV_PIX_FMT_YUV420P14LE : AV_PIX_FMT_YUV420P16LE)));
       break;
     case LAVPixFmt_YUV422bX:
-      fmt = (bpp == 9) ? PIX_FMT_YUV422P9LE : ((bpp == 10) ? PIX_FMT_YUV422P10LE : ((bpp == 12) ? PIX_FMT_YUV422P12LE : ((bpp == 14) ? PIX_FMT_YUV422P14LE : PIX_FMT_YUV422P16LE)));
+      fmt = (bpp == 9) ? AV_PIX_FMT_YUV422P9LE : ((bpp == 10) ? AV_PIX_FMT_YUV422P10LE : ((bpp == 12) ? AV_PIX_FMT_YUV422P12LE : ((bpp == 14) ? AV_PIX_FMT_YUV422P14LE : AV_PIX_FMT_YUV422P16LE)));
       break;
     case LAVPixFmt_YUV444bX:
-      fmt = (bpp == 9) ? PIX_FMT_YUV444P9LE : ((bpp == 10) ? PIX_FMT_YUV444P10LE : ((bpp == 12) ? PIX_FMT_YUV444P12LE : ((bpp == 14) ? PIX_FMT_YUV444P14LE : PIX_FMT_YUV444P16LE)));
+      fmt = (bpp == 9) ? AV_PIX_FMT_YUV444P9LE : ((bpp == 10) ? AV_PIX_FMT_YUV444P10LE : ((bpp == 12) ? AV_PIX_FMT_YUV444P12LE : ((bpp == 14) ? AV_PIX_FMT_YUV444P14LE : AV_PIX_FMT_YUV444P16LE)));
       break;
     default:
       ASSERT(0);
diff --git a/decoder/LAVVideo/pixconv/convert_generic.cpp b/decoder/LAVVideo/pixconv/convert_generic.cpp
index bc9cfa97..47ea2954 100644
--- a/decoder/LAVVideo/pixconv/convert_generic.cpp
+++ b/decoder/LAVVideo/pixconv/convert_generic.cpp
@@ -34,10 +34,10 @@ DECLARE_CONV_FUNC_IMPL(convert_generic)
 
   switch (m_OutputPixFmt) {
   case LAVOutPixFmt_YV12:
-    hr = swscale_scale(inputFmt, PIX_FMT_YUV420P, src, srcStride, dst, width, height, dstStride, lav_pixfmt_desc[m_OutputPixFmt], true);
+    hr = swscale_scale(inputFmt, AV_PIX_FMT_YUV420P, src, srcStride, dst, width, height, dstStride, lav_pixfmt_desc[m_OutputPixFmt], true);
     break;
   case LAVOutPixFmt_NV12:
-    hr = swscale_scale(inputFmt, PIX_FMT_NV12, src, srcStride, dst, width, height, dstStride, lav_pixfmt_desc[m_OutputPixFmt]);
+    hr = swscale_scale(inputFmt, AV_PIX_FMT_NV12, src, srcStride, dst, width, height, dstStride, lav_pixfmt_desc[m_OutputPixFmt]);
     break;
   case LAVOutPixFmt_YUY2:
     hr = ConvertTo422Packed(src, srcStride, dst, width, height, dstStride);
@@ -67,10 +67,10 @@ DECLARE_CONV_FUNC_IMPL(convert_generic)
     hr = ConvertToY416(src, srcStride, dst, width, height, dstStride);
     break;
   case LAVOutPixFmt_RGB32:
-    hr = swscale_scale(inputFmt, PIX_FMT_BGRA, src, srcStride, dst, width, height, dstStride * 4, lav_pixfmt_desc[m_OutputPixFmt]);
+    hr = swscale_scale(inputFmt, AV_PIX_FMT_BGRA, src, srcStride, dst, width, height, dstStride * 4, lav_pixfmt_desc[m_OutputPixFmt]);
     break;
   case LAVOutPixFmt_RGB24:
-    hr = swscale_scale(inputFmt, PIX_FMT_BGR24, src, srcStride, dst, width, height, dstStride * 3, lav_pixfmt_desc[m_OutputPixFmt]);
+    hr = swscale_scale(inputFmt, AV_PIX_FMT_BGR24, src, srcStride, dst, width, height, dstStride * 3, lav_pixfmt_desc[m_OutputPixFmt]);
     break;
   case LAVOutPixFmt_v210:
     hr = ConvertTov210(src, srcStride, dst, width, height, dstStride);
@@ -79,10 +79,10 @@ DECLARE_CONV_FUNC_IMPL(convert_generic)
     hr = ConvertTov410(src, srcStride, dst, width, height, dstStride);
     break;
   case LAVOutPixFmt_YV16:
-    hr = swscale_scale(inputFmt, PIX_FMT_YUV422P, src, srcStride, dst, width, height, dstStride, lav_pixfmt_desc[m_OutputPixFmt], true);
+    hr = swscale_scale(inputFmt, AV_PIX_FMT_YUV422P, src, srcStride, dst, width, height, dstStride, lav_pixfmt_desc[m_OutputPixFmt], true);
     break;
   case LAVOutPixFmt_YV24:
-    hr = swscale_scale(inputFmt, PIX_FMT_YUV444P, src, srcStride, dst, width, height, dstStride, lav_pixfmt_desc[m_OutputPixFmt], true);
+    hr = swscale_scale(inputFmt, AV_PIX_FMT_YUV444P, src, srcStride, dst, width, height, dstStride, lav_pixfmt_desc[m_OutputPixFmt], true);
     break;
   default:
     ASSERT(0);
@@ -189,7 +189,7 @@ HRESULT CLAVPixFmtConverter::ConvertTo422Packed(const uint8_t* const src[4], con
     dstStride[2] = scaleStride / 2;
     dstStride[3] = 0;
 
-    SwsContext *ctx = GetSWSContext(width, height, GetFFInput(), PIX_FMT_YUV422P, SWS_FAST_BILINEAR);
+    SwsContext *ctx = GetSWSContext(width, height, GetFFInput(), AV_PIX_FMT_YUV422P, SWS_FAST_BILINEAR);
     sws_scale(ctx, src, srcStride, 0, height, dst, dstStride);
 
     y = dst[0];
@@ -286,7 +286,7 @@ HRESULT CLAVPixFmtConverter::ConvertToAYUV(const uint8_t* const src[4], const in
     swStride[2] = scaleStride;
     swStride[3] = 0;
 
-    SwsContext *ctx = GetSWSContext(width, height, GetFFInput(), PIX_FMT_YUV444P, SWS_POINT);
+    SwsContext *ctx = GetSWSContext(width, height, GetFFInput(), AV_PIX_FMT_YUV444P, SWS_POINT);
     sws_scale(ctx, src, srcStride, 0, height, dst, swStride);
 
     y = dst[0];
@@ -360,7 +360,7 @@ HRESULT CLAVPixFmtConverter::ConvertToPX1X(const uint8_t* const src[4], const in
     dstStride[2] = scaleStride / 2;
     dstStride[3] = 0;
 
-    SwsContext *ctx = GetSWSContext(width, height, GetFFInput(), chromaVertical == 1 ? PIX_FMT_YUV422P16LE : PIX_FMT_YUV420P16LE, SWS_POINT);
+    SwsContext *ctx = GetSWSContext(width, height, GetFFInput(), chromaVertical == 1 ? AV_PIX_FMT_YUV422P16LE : AV_PIX_FMT_YUV420P16LE, SWS_POINT);
     sws_scale(ctx, src, srcStride, 0, height, dst, dstStride);
 
     y = dst[0];
@@ -466,7 +466,7 @@ HRESULT CLAVPixFmtConverter::ConvertToY410(const uint8_t* const src[4], const in
     dstStride[2] = scaleStride * 2;
     dstStride[3] = 0;
 
-    SwsContext *ctx = GetSWSContext(width, height, GetFFInput(), PIX_FMT_YUV444P10LE, SWS_POINT);
+    SwsContext *ctx = GetSWSContext(width, height, GetFFInput(), AV_PIX_FMT_YUV444P10LE, SWS_POINT);
     sws_scale(ctx, src, srcStride, 0, height, dst, dstStride);
 
     y = (int16_t *)dst[0];
@@ -528,7 +528,7 @@ HRESULT CLAVPixFmtConverter::ConvertToY416(const uint8_t* const src[4], const in
     dstStride[2] = scaleStride * 2;
     dstStride[3] = 0;
 
-    SwsContext *ctx = GetSWSContext(width, height, GetFFInput(), PIX_FMT_YUV444P16LE, SWS_POINT);
+    SwsContext *ctx = GetSWSContext(width, height, GetFFInput(), AV_PIX_FMT_YUV444P16LE, SWS_POINT);
     sws_scale(ctx, src, srcStride, 0, height, dst, dstStride);
 
     y = (int16_t *)dst[0];
@@ -585,7 +585,7 @@ HRESULT CLAVPixFmtConverter::ConvertTov210(const uint8_t* const src[4], const in
     dstStride[2] = scaleStride;
     dstStride[3] = 0;
 
-    SwsContext *ctx = GetSWSContext(width, height, GetFFInput(), PIX_FMT_YUV422P10LE, SWS_POINT);
+    SwsContext *ctx = GetSWSContext(width, height, GetFFInput(), AV_PIX_FMT_YUV422P10LE, SWS_POINT);
     sws_scale(ctx, src, srcStride, 0, height, dst, dstStride);
 
     y = (int16_t *)dst[0];
@@ -679,7 +679,7 @@ HRESULT CLAVPixFmtConverter::ConvertTov410(const uint8_t* const src[4], const in
     dstStride[2] = scaleStride * 2;
     dstStride[3] = 0;
 
-    SwsContext *ctx = GetSWSContext(width, height, GetFFInput(), PIX_FMT_YUV444P10LE, SWS_POINT);
+    SwsContext *ctx = GetSWSContext(width, height, GetFFInput(), AV_PIX_FMT_YUV444P10LE, SWS_POINT);
     sws_scale(ctx, src, srcStride, 0, height, dst, dstStride);
 
     y = (int16_t *)dst[0];
diff --git a/decoder/LAVVideo/subtitles/LAVSubtitleConsumer.cpp b/decoder/LAVVideo/subtitles/LAVSubtitleConsumer.cpp
index 14bdc093..62a27f8a 100644
--- a/decoder/LAVVideo/subtitles/LAVSubtitleConsumer.cpp
+++ b/decoder/LAVVideo/subtitles/LAVSubtitleConsumer.cpp
@@ -209,17 +209,17 @@ static struct {
   LAVPixelFormat pixfmt;
   PixelFormat ffpixfmt;
 } lav_ff_subtitle_pixfmt_map[] = {
-  { LAVPixFmt_YUV420,   PIX_FMT_YUVA420P },
-  { LAVPixFmt_YUV420bX, PIX_FMT_YUVA420P },
-  { LAVPixFmt_YUV422,   PIX_FMT_YUVA422P },
-  { LAVPixFmt_YUV422bX, PIX_FMT_YUVA422P },
-  { LAVPixFmt_YUV444,   PIX_FMT_YUVA444P },
-  { LAVPixFmt_YUV444bX, PIX_FMT_YUVA444P },
-  { LAVPixFmt_NV12,     PIX_FMT_YUVA420P },
-  { LAVPixFmt_YUY2,     PIX_FMT_YUVA422P },
-  { LAVPixFmt_RGB24,    PIX_FMT_BGRA     },
-  { LAVPixFmt_RGB32,    PIX_FMT_BGRA     },
-  { LAVPixFmt_ARGB32,   PIX_FMT_BGRA     },
+  { LAVPixFmt_YUV420,   AV_PIX_FMT_YUVA420P },
+  { LAVPixFmt_YUV420bX, AV_PIX_FMT_YUVA420P },
+  { LAVPixFmt_YUV422,   AV_PIX_FMT_YUVA422P },
+  { LAVPixFmt_YUV422bX, AV_PIX_FMT_YUVA422P },
+  { LAVPixFmt_YUV444,   AV_PIX_FMT_YUVA444P },
+  { LAVPixFmt_YUV444bX, AV_PIX_FMT_YUVA444P },
+  { LAVPixFmt_NV12,     AV_PIX_FMT_YUVA420P },
+  { LAVPixFmt_YUY2,     AV_PIX_FMT_YUVA422P },
+  { LAVPixFmt_RGB24,    AV_PIX_FMT_BGRA     },
+  { LAVPixFmt_RGB32,    AV_PIX_FMT_BGRA     },
+  { LAVPixFmt_ARGB32,   AV_PIX_FMT_BGRA     },
 };
 
 static LAVPixFmtDesc ff_sub_pixfmt_desc[] = {
@@ -233,16 +233,16 @@ static LAVPixFmtDesc getFFSubPixelFormatDesc(PixelFormat pixFmt)
 {
   int index = 0;
   switch(pixFmt) {
-  case PIX_FMT_YUVA420P:
+  case AV_PIX_FMT_YUVA420P:
     index = 0;
     break;
-  case PIX_FMT_YUVA422P:
+  case AV_PIX_FMT_YUVA422P:
     index = 1;
     break;
-  case PIX_FMT_YUVA444P:
+  case AV_PIX_FMT_YUVA444P:
     index = 2;
     break;
-  case PIX_FMT_BGRA:
+  case AV_PIX_FMT_BGRA:
     index = 3;
     break;
   default:
@@ -253,14 +253,14 @@ static LAVPixFmtDesc getFFSubPixelFormatDesc(PixelFormat pixFmt)
 
 static PixelFormat getFFPixFmtForSubtitle(LAVPixelFormat pixFmt)
 {
-  PixelFormat fmt = PIX_FMT_NONE;
+  PixelFormat fmt = AV_PIX_FMT_NONE;
   for(int i = 0; i < countof(lav_ff_subtitle_pixfmt_map); i++) {
     if (lav_ff_subtitle_pixfmt_map[i].pixfmt == pixFmt) {
       return lav_ff_subtitle_pixfmt_map[i].ffpixfmt;
     }
   }
   ASSERT(0);
-  return PIX_FMT_NONE;
+  return AV_PIX_FMT_NONE;
 }
 
 STDMETHODIMP CLAVSubtitleConsumer::SelectBlendFunction()
@@ -345,7 +345,7 @@ STDMETHODIMP CLAVSubtitleConsumer::ProcessSubtitleBitmap(LAVPixelFormat pixFmt,
     subPosition.x = (LONG)av_rescale(subPosition.x, newSize.cx, subSize.cx);
     subPosition.y = (LONG)av_rescale(subPosition.y, newSize.cy, subSize.cy);
 
-    m_pSwsContext = sws_getCachedContext(m_pSwsContext, subSize.cx, subSize.cy, PIX_FMT_BGRA, newSize.cx, newSize.cy, avPixFmt, SWS_BILINEAR|SWS_FULL_CHR_H_INP, NULL, NULL, NULL);
+    m_pSwsContext = sws_getCachedContext(m_pSwsContext, subSize.cx, subSize.cy, AV_PIX_FMT_BGRA, newSize.cx, newSize.cy, avPixFmt, SWS_BILINEAR|SWS_FULL_CHR_H_INP, NULL, NULL, NULL);
 
     const uint8_t *src[4] = { (const uint8_t *)rgbData, NULL, NULL, NULL };
     const int srcStride[4] = { pitch * 4, 0, 0, 0 };
@@ -361,7 +361,7 @@ STDMETHODIMP CLAVSubtitleConsumer::ProcessSubtitleBitmap(LAVPixelFormat pixFmt,
 
     // Un-pre-multiply alpha for YUV formats
     // TODO: Can we SIMD this? See ARGBUnattenuateRow_C/SSE2 in libyuv
-    if (avPixFmt != PIX_FMT_BGRA) {
+    if (avPixFmt != AV_PIX_FMT_BGRA) {
       tmpBuf = (uint8_t *)av_malloc(pitch * subSize.cy * 4);
       memcpy(tmpBuf, rgbData, pitch * subSize.cy * 4);
       for (int line = 0; line < subSize.cy; line++) {