pcmdec: change default of channels parameter to 1

[ffmpeg] / libavformat / gxf.h

diff --git a/libavformat/gxf.h b/libavformat/gxf.h
index ab37cb97fff62c1b859a1245fbc71fc62e7ea739..c1ac3994588385d88adae01853fbb38263659e44 100644 (file)
--- a/libavformat/gxf.h
+++ b/libavformat/gxf.h
@@ -2,34 +2,33 @@
  * GXF demuxer
  * copyright (c) 2006 Reimar Doeffinger
  *
- * 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
  */
 
-#ifndef FFMPEG_GXF_H
-#define FFMPEG_GXF_H
+#ifndef AVFORMAT_GXF_H
+#define AVFORMAT_GXF_H
 
-/* gxf.c */
 typedef enum {
     PKT_MAP         = 0xbc,
     PKT_MEDIA       = 0xbf,
     PKT_EOS         = 0xfb,
     PKT_FLT         = 0xfc,
     PKT_UMF         = 0xfd,
-} pkt_type_t;
+} GXFPktType;
 
 typedef enum {
     MAT_NAME        = 0x40,
@@ -38,7 +37,7 @@ typedef enum {
     MAT_MARK_IN     = 0x43,
     MAT_MARK_OUT    = 0x44,
     MAT_SIZE        = 0x45,
-} mat_tag_t;
+} GXFMatTag;
 
 typedef enum {
     TRACK_NAME      = 0x4c,
@@ -48,6 +47,6 @@ typedef enum {
     TRACK_FPS       = 0x50,
     TRACK_LINES     = 0x51,
     TRACK_FPF       = 0x52,
-} track_tag_t;
+} GXFTrackTag;
 
-#endif /* FFMPEG_GXF_H */
+#endif /* AVFORMAT_GXF_H */