Fix deprecation warnings

FFMS · Sep 13, 2015 · 33a5eaa · 33a5eaa
1 parent ff537d3
commit 33a5eaa
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/include/ffmscompat.h b/include/ffmscompat.h
@@ -102,6 +102,12 @@ static const AVPixFmtDescriptor *av_pix_fmt_desc_get(AVPixelFormat pix_fmt) {
 #	if VERSION_CHECK(LIBAVUTIL_VERSION_INT, <, 52, 9, 0, 52, 20, 100)
 #		define av_frame_alloc avcodec_alloc_frame
 #	endif
+
+#	if VERSION_CHECK(LIBAVUTIL_VERSION_INT, >, 55, 0, 0, 55, 0, 100) || defined(FF_API_PLUS1_MINUS1)
+#		define FFMS_DEPTH(x) ((x).depth)
+#	else
+#		define FFMS_DEPTH(x) ((x).depth_minus1 + 1)
+#	endif
 #endif
 
 

diff --git a/src/core/videoutils.cpp b/src/core/videoutils.cpp
@@ -144,10 +144,10 @@ struct LossAttributes {
 
 static int GetPseudoDepth(const AVPixFmtDescriptor &Desc) {
 	// Comparing the pseudo depth makes sure that rgb565-ish formats get selected over rgb555-ish ones
-	int depth = -1;
+	int depth = 0;
 	for (int i = 0; i < Desc.nb_components; i++)
-		depth = FFMAX(depth, Desc.comp[i].depth_minus1);
-	return depth + 1;
+		depth = FFMAX(depth, FFMS_DEPTH(Desc.comp[i]));
+	return depth;
 }
 
 static LossAttributes CalculateLoss(AVPixelFormat Dst, AVPixelFormat Src) {

diff --git a/src/vapoursynth/vapoursource.cpp b/src/vapoursynth/vapoursource.cpp
@@ -40,11 +40,11 @@ static bool IsRealNativeEndianPlanar(const AVPixFmtDescriptor &desc) {
 	int used_planes = 0;
 	for (int i = 0; i < desc.nb_components; i++)
 		used_planes = std::max(used_planes, (int)desc.comp[i].plane + 1);
-	bool temp = (used_planes == desc.nb_components) && (desc.comp[0].depth_minus1 + 1 >= 8) &&
+	bool temp = (used_planes == desc.nb_components) && (FFMS_DEPTH(desc.comp[0]) >= 8) &&
 		(!(desc.flags & FFMS_PIX_FMT_FLAG(PAL)));
 	if (!temp)
 		return false;
-	else if (desc.comp[0].depth_minus1 + 1 == 8)
+	else if (FFMS_DEPTH(desc.comp[0]) == 8)
 		return temp;
 	else
 		return (FFMS_PIX_FMT(YUV420P10) == FFMS_PIX_FMT(YUV420P10BE) ? !!(desc.flags & FFMS_PIX_FMT_FLAG(BE)) : !(desc.flags & FFMS_PIX_FMT_FLAG(BE)));
@@ -76,7 +76,7 @@ static int FormatConversionToPixelFormat(int id, bool Alpha, VSCore *core, const
 			const AVPixFmtDescriptor &desc = *av_pix_fmt_desc_get((AVPixelFormat)i);
 			if (IsRealNativeEndianPlanar(desc) && !HasAlpha(desc)
 				&& GetColorFamily(desc) == f->colorFamily
-				&& desc.comp[0].depth_minus1 + 1 == f->bitsPerSample
+				&& FFMS_DEPTH(desc.comp[0]) == f->bitsPerSample
 				&& desc.log2_chroma_w == f->subSamplingW
 				&& desc.log2_chroma_h == f->subSamplingH)
 				return i;
@@ -87,7 +87,7 @@ static int FormatConversionToPixelFormat(int id, bool Alpha, VSCore *core, const
 		const AVPixFmtDescriptor &desc = *av_pix_fmt_desc_get((AVPixelFormat)i);
 		if (IsRealNativeEndianPlanar(desc) && HasAlpha(desc)
 			&& GetColorFamily(desc) == f->colorFamily
-			&& desc.comp[0].depth_minus1 + 1 == f->bitsPerSample
+			&& FFMS_DEPTH(desc.comp[0]) == f->bitsPerSample
 			&& desc.log2_chroma_w == f->subSamplingW
 			&& desc.log2_chroma_h == f->subSamplingH)
 			return i;
@@ -97,7 +97,7 @@ static int FormatConversionToPixelFormat(int id, bool Alpha, VSCore *core, const
 
 static const VSFormat *FormatConversionToVS(int id, VSCore *core, const VSAPI *vsapi) {
 	return vsapi->registerFormat(GetColorFamily(*av_pix_fmt_desc_get((AVPixelFormat)id)), stInteger,
-		av_pix_fmt_desc_get((AVPixelFormat)id)->comp[0].depth_minus1 + 1,
+		FFMS_DEPTH(av_pix_fmt_desc_get((AVPixelFormat)id)->comp[0]),
 		av_pix_fmt_desc_get((AVPixelFormat)id)->log2_chroma_w,
 		av_pix_fmt_desc_get((AVPixelFormat)id)->log2_chroma_h, core);
 }