]> git.sesse.net Git - ffmpeg/blobdiff - libavfilter/af_amix.c
Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88'
[ffmpeg] / libavfilter / af_amix.c
index a93adddf3481f82e0eb7e67d276ae34a56cd9eed..37853ca1ee5fab9e4009ecb2d25f5bfd900691a6 100644 (file)
  * output.
  */
 
-#include "libavutil/audioconvert.h"
 #include "libavutil/audio_fifo.h"
 #include "libavutil/avassert.h"
 #include "libavutil/avstring.h"
+#include "libavutil/channel_layout.h"
 #include "libavutil/common.h"
 #include "libavutil/float_dsp.h"
 #include "libavutil/mathematics.h"