diff options
| author | Michael Niedermayer | 2014-09-26 22:27:37 +0200 |
|---|---|---|
| committer | Michael Niedermayer | 2014-09-26 22:33:28 +0200 |
| commit | 7618d360ca0b5c50c9893e45f7b0b3575ee9ccfc (patch) | |
| tree | 2d9c86fd8367c9f93134dbfd9ca0160efc1b7950 /libavcodec/flacdec.c | |
| parent | c895fa7f66c01de6cfead8b1866dad478daad948 (diff) | |
| parent | 7703995a2e8760e66ff35148bf029e0f9e30dbe6 (diff) | |
Merge commit '7703995a2e8760e66ff35148bf029e0f9e30dbe6'
* commit '7703995a2e8760e66ff35148bf029e0f9e30dbe6':
flac: Remove unused headers
Conflicts:
libavcodec/flacdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/flacdec.c')
| -rw-r--r-- | libavcodec/flacdec.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/flacdec.c b/libavcodec/flacdec.c index c9dbc14726..1333972d66 100644 --- a/libavcodec/flacdec.c +++ b/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" |