virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity

Merge commit '2d40968dd3ff17b12f7c80dbfad409b14418e267'

Browse Source 
* commit '2d40968dd3ff17b12f7c80dbfad409b14418e267':
  lavu: Drop deprecated audioconvert.h header

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
This commit is contained in:
Hendrik Leppkes 2015-09-05 17:18:05 +02:00
commit d9218011ef
3 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libavutil/Makefile
View File

@ -6,7 +6,6 @@ HEADERS = adler32.h \
aes.h \ aes.h \
attributes.h \ attributes.h \
audio_fifo.h \ audio_fifo.h \
audioconvert.h \
avassert.h \ avassert.h \
avstring.h \ avstring.h \
avutil.h \ avutil.h \

6
libavutil/audioconvert.h
View File

@ -1,6 +0,0 @@
#include "version.h"
#if FF_API_AUDIOCONVERT
#include "channel_layout.h"
#endif

3
libavutil/version.h
View File

@ -90,9 +90,6 @@
#ifndef FF_API_CONTEXT_SIZE #ifndef FF_API_CONTEXT_SIZE
#define FF_API_CONTEXT_SIZE (LIBAVUTIL_VERSION_MAJOR < 55) #define FF_API_CONTEXT_SIZE (LIBAVUTIL_VERSION_MAJOR < 55)
#endif #endif
#ifndef FF_API_AUDIOCONVERT
#define FF_API_AUDIOCONVERT (LIBAVUTIL_VERSION_MAJOR < 55)
#endif
#ifndef FF_API_CPU_FLAG_MMX2 #ifndef FF_API_CPU_FLAG_MMX2
#define FF_API_CPU_FLAG_MMX2 (LIBAVUTIL_VERSION_MAJOR < 55) #define FF_API_CPU_FLAG_MMX2 (LIBAVUTIL_VERSION_MAJOR < 55)
#endif #endif