diff --git a/aegisub/src/video_provider_ffmpegsource.cpp b/aegisub/src/video_provider_ffmpegsource.cpp index 26c8ed6ec..75f59b258 100644 --- a/aegisub/src/video_provider_ffmpegsource.cpp +++ b/aegisub/src/video_provider_ffmpegsource.cpp @@ -55,8 +55,8 @@ FFmpegSourceVideoProvider::FFmpegSourceVideoProvider(Aegisub::String filename, d // clean up variables VideoSource = NULL; Index = NULL; - DstFormat = FFMS_PIX_FMT_NONE; - LastDstFormat = FFMS_PIX_FMT_NONE; + DstFormat = PIX_FMT_NONE; + LastDstFormat = PIX_FMT_NONE; KeyFramesLoaded = false; FrameNumber = -1; MessageSize = sizeof(FFMSErrorMessage); @@ -194,8 +194,8 @@ void FFmpegSourceVideoProvider::Close() { if (Index) FFMS_DestroyFrameIndex(Index); - DstFormat = FFMS_PIX_FMT_NONE; - LastDstFormat = FFMS_PIX_FMT_NONE; + DstFormat = PIX_FMT_NONE; + LastDstFormat = PIX_FMT_NONE; KeyFramesLoaded = false; KeyFramesList.clear(); TimecodesVector.clear(); @@ -226,19 +226,19 @@ const AegiVideoFrame FFmpegSourceVideoProvider::GetFrame(int _n, int FormatType) // choose output format if (FormatType & FORMAT_RGB32 && big_endian) { - DstFormat = FFMS_PIX_FMT_BGR32_1; + DstFormat = PIX_FMT_BGR32_1; DstFrame.format = FORMAT_RGB32; } else if (FormatType & FORMAT_RGB32 && !big_endian) { - DstFormat = FFMS_PIX_FMT_RGB32; + DstFormat = PIX_FMT_RGB32; DstFrame.format = FORMAT_RGB32; } else if (FormatType & FORMAT_RGB24) { - DstFormat = FFMS_PIX_FMT_BGR24; + DstFormat = PIX_FMT_BGR24; DstFrame.format = FORMAT_RGB24; } else if (FormatType & FORMAT_YV12) { - DstFormat = FFMS_PIX_FMT_YUV420P; // may or may not work + DstFormat = PIX_FMT_YUV420P; // may or may not work DstFrame.format = FORMAT_YV12; } else if (FormatType & FORMAT_YUY2) { - DstFormat = FFMS_PIX_FMT_YUYV422; + DstFormat = PIX_FMT_YUYV422; DstFrame.format = FORMAT_YUY2; } else throw _T("FFmpegSource video provider: upstream provider requested unknown or unsupported pixel format"); diff --git a/aegisub/src/video_provider_ffmpegsource.h b/aegisub/src/video_provider_ffmpegsource.h index 9e2b7f341..38e23ae2f 100644 --- a/aegisub/src/video_provider_ffmpegsource.h +++ b/aegisub/src/video_provider_ffmpegsource.h @@ -57,8 +57,8 @@ private: std::vector TimecodesVector; FrameRate Timecodes; - FFMS_PixelFormat DstFormat; - FFMS_PixelFormat LastDstFormat; + PixelFormat DstFormat; + PixelFormat LastDstFormat; AegiVideoFrame CurFrame; char FFMSErrorMessage[1024];