flacdec: allow mid-stream channel layout change

[ffmpeg] / libavcodec / mlp_parser.h

diff --git a/libavcodec/mlp_parser.h b/libavcodec/mlp_parser.h
index c9f979e61b5c418961b18f5a7cf99839e0f0db11..35bb312f17acd32dddcbe9566cf7b4cd9c14426e 100644 (file)
--- a/libavcodec/mlp_parser.h
+++ b/libavcodec/mlp_parser.h
@@ -2,32 +2,32 @@
  * MLP parser prototypes
  * Copyright (c) 2007 Ian Caulfield
  *
- * This file is part of FFmpeg.
+ * This file is part of Libav.
  *
- * FFmpeg is free software; you can redistribute it and/or
+ * Libav is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
  *
- * FFmpeg is distributed in the hope that it will be useful,
+ * Libav is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
+ * License along with Libav; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 /**
- * @file mlp_parser.h
+ * @file
  * MLP parser prototypes
  */
 
-#ifndef FFMPEG_MLP_PARSER_H
-#define FFMPEG_MLP_PARSER_H
+#ifndef AVCODEC_MLP_PARSER_H
+#define AVCODEC_MLP_PARSER_H
 
-#include <inttypes.h>
+#include "get_bits.h"
 
 typedef struct MLPHeaderInfo
 {
@@ -55,5 +55,4 @@ typedef struct MLPHeaderInfo
 
 int ff_mlp_read_major_sync(void *log, MLPHeaderInfo *mh, GetBitContext *gb);
 
-#endif /* FFMPEG_MLP_PARSER_H */
-
+#endif /* AVCODEC_MLP_PARSER_H */