oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

lib/ffmpeg/{Buffer,Time}: remove obsolete "#undef SampleFormat"

Browse Source 
This compatibility macro has been removed from FFmpeg long ago.
This commit is contained in:
Max Kellermann 2020-11-04 19:50:21 +01:00
parent 84f772357e
commit 9332527872
2 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/lib/ffmpeg/Buffer.hxx
View File

@ -26,11 +26,6 @@ extern "C" {
#include <cstddef> #include <cstddef>
/* suppress the ffmpeg compatibility macro */
#ifdef SampleFormat
#undef SampleFormat
#endif
class FfmpegBuffer { class FfmpegBuffer {
void *data; void *data;
unsigned size; unsigned size;

5
src/lib/ffmpeg/Time.hxx
View File

@ -31,11 +31,6 @@ extern "C" {
#include <cassert> #include <cassert>
#include <cstdint> #include <cstdint>
/* suppress the ffmpeg compatibility macro */
#ifdef SampleFormat
#undef SampleFormat
#endif
/* redefine AV_TIME_BASE_Q because libavutil's macro definition is a /* redefine AV_TIME_BASE_Q because libavutil's macro definition is a
compound literal, which is illegal in C++ */ compound literal, which is illegal in C++ */
#ifdef AV_TIME_BASE_Q #ifdef AV_TIME_BASE_Q