From 9332527872e0fa5d33adaf292e5d7e1a1ec920f5 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Wed, 4 Nov 2020 19:50:21 +0100 Subject: lib/ffmpeg/{Buffer,Time}: remove obsolete "#undef SampleFormat" This compatibility macro has been removed from FFmpeg long ago. --- src/lib/ffmpeg/Buffer.hxx | 5 ----- src/lib/ffmpeg/Time.hxx | 5 ----- 2 files changed, 10 deletions(-) (limited to 'src') diff --git a/src/lib/ffmpeg/Buffer.hxx b/src/lib/ffmpeg/Buffer.hxx index cab4375d9..c719a2257 100644 --- a/src/lib/ffmpeg/Buffer.hxx +++ b/src/lib/ffmpeg/Buffer.hxx @@ -26,11 +26,6 @@ extern "C" { #include -/* suppress the ffmpeg compatibility macro */ -#ifdef SampleFormat -#undef SampleFormat -#endif - class FfmpegBuffer { void *data; unsigned size; diff --git a/src/lib/ffmpeg/Time.hxx b/src/lib/ffmpeg/Time.hxx index 03b8e8bce..39ebd3855 100644 --- a/src/lib/ffmpeg/Time.hxx +++ b/src/lib/ffmpeg/Time.hxx @@ -31,11 +31,6 @@ extern "C" { #include #include -/* suppress the ffmpeg compatibility macro */ -#ifdef SampleFormat -#undef SampleFormat -#endif - /* redefine AV_TIME_BASE_Q because libavutil's macro definition is a compound literal, which is illegal in C++ */ #ifdef AV_TIME_BASE_Q -- cgit v1.2.3