Merge commit '2d40968dd3ff17b12f7c80dbfad409b14418e267'
* commit '2d40968dd3ff17b12f7c80dbfad409b14418e267': lavu: Drop deprecated audioconvert.h header Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
This commit is contained in:
commit
d9218011ef
@ -6,7 +6,6 @@ HEADERS = adler32.h \
|
||||
aes.h \
|
||||
attributes.h \
|
||||
audio_fifo.h \
|
||||
audioconvert.h \
|
||||
avassert.h \
|
||||
avstring.h \
|
||||
avutil.h \
|
||||
|
@ -1,6 +0,0 @@
|
||||
|
||||
#include "version.h"
|
||||
|
||||
#if FF_API_AUDIOCONVERT
|
||||
#include "channel_layout.h"
|
||||
#endif
|
@ -90,9 +90,6 @@
|
||||
#ifndef FF_API_CONTEXT_SIZE
|
||||
#define FF_API_CONTEXT_SIZE (LIBAVUTIL_VERSION_MAJOR < 55)
|
||||
#endif
|
||||
#ifndef FF_API_AUDIOCONVERT
|
||||
#define FF_API_AUDIOCONVERT (LIBAVUTIL_VERSION_MAJOR < 55)
|
||||
#endif
|
||||
#ifndef FF_API_CPU_FLAG_MMX2
|
||||
#define FF_API_CPU_FLAG_MMX2 (LIBAVUTIL_VERSION_MAJOR < 55)
|
||||
#endif
|
||||
|
Loading…
Reference in New Issue
Block a user