summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/lib/ffmpeg/Buffer.hxx5
-rw-r--r--src/lib/ffmpeg/Time.hxx5
2 files changed, 0 insertions, 10 deletions
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 <cstddef>
-/* 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 <cassert>
#include <cstdint>
-/* 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