Merge commit '7703995a'

* commit '7703995a':
  flac: Remove unused headers

Conflicts:
	libavcodec/flacdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

libavcodec/flacdec.c

@@ -34,7 +34,6 @@
 #include <limits.h>
 
 #include "libavutil/avassert.h"
-#include "libavutil/channel_layout.h"
 #include "libavutil/crc.h"
 #include "avcodec.h"
 #include "internal.h"