Merge commit '7703995a2e8760e66ff35148bf029e0f9e30dbe6'

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

Conflicts:
	libavcodec/flacdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavcodec/flacdec.c
index c9dbc14,a475309..1333972
--- 1/libavcodec/flacdec.c
--- 2/libavcodec/flacdec.c
+++ b/libavcodec/flacdec.c
@@@ -33,9 -33,6 +33,8 @@@
  
  #include <limits.h>
  
- #include "libavutil/channel_layout.h"
 +#include "libavutil/avassert.h"
 +#include "libavutil/crc.h"
  #include "avcodec.h"
  #include "internal.h"
  #include "get_bits.h"