Merge commit '7703995a2e8760e66ff35148bf029e0f9e30dbe6'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 26 Sep 2014 20:27:37 +0000 (22:27 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 26 Sep 2014 20:33:28 +0000 (22:33 +0200)
* commit '7703995a2e8760e66ff35148bf029e0f9e30dbe6':
  flac: Remove unused headers

Conflicts:
libavcodec/flacdec.c

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

index c9dbc14726e2c9c008314c18a8d5463f4129e946,a4753097e0ff5924006beccbf37aca2dc2a11dbe..1333972d66082f892c962d033250f4e9325e4f72
@@@ -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"