X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Fvoc.h;h=1668618fda076dec54cca0c8fb8c73919a223399;hb=ccc10acb5b941973acab49d64459bb110cc0a529;hp=606f2152e5f0b9f714dd833121dd6fadef4368df;hpb=5b21bdabe43611385d1d55a21d5b1f607b133d29;p=ffmpeg

diff --git a/libavformat/voc.h b/libavformat/voc.h
index 606f2152e5f..1668618fda0 100644
--- a/libavformat/voc.h
+++ b/libavformat/voc.h
@@ -2,32 +2,32 @@
  * Creative Voice File demuxer.
  * Copyright (c) 2006  Aurelien Jacobs <aurel@gnuage.org>
  *
- * 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_VOC_H
-#define FFMPEG_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;
+    int64_t remaining_size;
+} VocDecContext;
 
 typedef enum voc_type {
     VOC_TYPE_EOF              = 0x00,
@@ -40,12 +40,12 @@ typedef enum voc_type {
     VOC_TYPE_REPETITION_END   = 0x07,
     VOC_TYPE_EXTENDED         = 0x08,
     VOC_TYPE_NEW_VOICE_DATA   = 0x09,
-} voc_type_t;
+} VocType;
 
-extern const unsigned char voc_magic[21];
-extern const AVCodecTag voc_codec_tags[];
+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);
+int ff_voc_get_packet(AVFormatContext *s, AVPacket *pkt,
+                      AVStream *st, int max_size);
 
-#endif /* FFMPEG_VOC_H */
+#endif /* AVFORMAT_VOC_H */