#include just the required stdint.h instead of libavutil/common.h.

[ffmpeg] / libavformat / voc.h

diff --git a/libavformat/voc.h b/libavformat/voc.h
index 968d77eb7c685c9aef5886f9a2aada054b6572b1..7993146f475dc2f3d0fba1a2878474964eef1311 100644 (file)
--- a/libavformat/voc.h
+++ b/libavformat/voc.h
@@ -2,31 +2,50 @@
  * Creative Voice File demuxer.
  * Copyright (c) 2006  Aurelien Jacobs <aurel@gnuage.org>
  *
- * This library is free software; you can redistribute it and/or
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg 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 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * This library is distributed in the hope that it will be useful,
+ * FFmpeg 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 this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef VOC_H
-#define VOC_H
+#ifndef AVFORMAT_VOC_H
+#define AVFORMAT_VOC_H
 
 #include "avformat.h"
+#include "riff.h"    /* for CodecTag */
 
 typedef struct voc_dec_context {
     int remaining_size;
-} voc_dec_context_t;
+} VocDecContext;
+
+typedef enum voc_type {
+    VOC_TYPE_EOF              = 0x00,
+    VOC_TYPE_VOICE_DATA       = 0x01,
+    VOC_TYPE_VOICE_DATA_CONT  = 0x02,
+    VOC_TYPE_SILENCE          = 0x03,
+    VOC_TYPE_MARKER           = 0x04,
+    VOC_TYPE_ASCII            = 0x05,
+    VOC_TYPE_REPETITION_START = 0x06,
+    VOC_TYPE_REPETITION_END   = 0x07,
+    VOC_TYPE_EXTENDED         = 0x08,
+    VOC_TYPE_NEW_VOICE_DATA   = 0x09,
+} VocType;
+
+extern const unsigned char ff_voc_magic[21];
+extern const AVCodecTag ff_voc_codec_tags[];
 
 int voc_get_packet(AVFormatContext *s, AVPacket *pkt,
                    AVStream *st, int max_size);
 
-#endif
+#endif /* AVFORMAT_VOC_H */