Merge remote branch 'qatar/master'

[ffmpeg] / libavformat / voc.h

diff --git a/libavformat/voc.h b/libavformat/voc.h
index 5f6998a0340f9f0a71081d62221e6d2c567144b3..3f995ad31ff8826e66e3813799f34b4e36a77e52 100644 (file)
--- a/libavformat/voc.h
+++ b/libavformat/voc.h
@@ -19,15 +19,15 @@
  * 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,7 +40,7 @@ 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 ff_voc_magic[21];
 extern const AVCodecTag ff_voc_codec_tags[];
@@ -48,4 +48,4 @@ extern const AVCodecTag ff_voc_codec_tags[];
 int voc_get_packet(AVFormatContext *s, AVPacket *pkt,
                    AVStream *st, int max_size);
 
-#endif /* FFMPEG_VOC_H */
+#endif /* AVFORMAT_VOC_H */