Index: acoustid-fingerprinter-0.6/decoder.h
===================================================================
--- acoustid-fingerprinter-0.6/decoder.h
+++ acoustid-fingerprinter-0.6/decoder.h	2017-03-09 16:53:14.070717675 +0100
@@ -116,7 +116,7 @@
 #endif
 {
 #ifdef HAVE_AV_AUDIO_CONVERT
-	m_buffer2 = (uint8_t *)av_malloc(AVCODEC_MAX_AUDIO_FRAME_SIZE * 2 + 16);
+	m_buffer2 = (uint8_t *)av_malloc(192000 * 2 + 16);
 #endif
 
 #if NEW_AVFRAME_API
Index: acoustid-fingerprinter-0.6/ffmpeg/audioconvert.h
===================================================================
--- acoustid-fingerprinter-0.6/ffmpeg/audioconvert.h
+++ acoustid-fingerprinter-0.6/ffmpeg/audioconvert.h	2017-03-09 16:53:30.788170715 +0100
@@ -79,7 +79,7 @@
  * @param fmt_name Format name, or NULL if unknown
  * @return Channel layout mask
  */
-uint64_t avcodec_guess_channel_layout(int nb_channels, enum CodecID codec_id, const char *fmt_name);
+uint64_t avcodec_guess_channel_layout(int nb_channels, enum AVCodecID codec_id, const char *fmt_name);
 
 struct AVAudioConvert;
 typedef struct AVAudioConvert AVAudioConvert;