Skip to content

M
mpd
Commit 93325278 authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

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

This compatibility macro has been removed from FFmpeg long ago.
parent 84f77235
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 10 deletions
src/lib/ffmpeg/Buffer.hxx
View file @ 93325278
...@@ -26,11 +26,6 @@ extern "C" { ...@@ -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;
......
src/lib/ffmpeg/Time.hxx
View file @ 93325278
...@@ -31,11 +31,6 @@ extern "C" { ...@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment