diff options
| author | Max Kellermann <max@musicpd.org> | 2020-11-04 19:50:21 +0100 |
|---|---|---|
| committer | Max Kellermann <max@musicpd.org> | 2020-11-04 19:50:33 +0100 |
| commit | 9332527872e0fa5d33adaf292e5d7e1a1ec920f5 (patch) | |
| tree | cd9c509cafdc7d2cba86f69145bda4ce6547d474 /src | |
| parent | 84f772357eb2582e28da6af04665a093ee468f0b (diff) | |
lib/ffmpeg/{Buffer,Time}: remove obsolete "#undef SampleFormat"
This compatibility macro has been removed from FFmpeg long ago.
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/ffmpeg/Buffer.hxx | 5 | ||||
| -rw-r--r-- | src/lib/ffmpeg/Time.hxx | 5 |
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 |