X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Fswf.h;h=affebe9c732a64aaca989cd8f9a2e2aff10c5c5b;hb=e8bb2e24398ec838d9e49cf115b7e132609a9fb7;hp=1b9b7fff35b4a6b00629e7692d026400fa93c5d1;hpb=3b35f4ab51b8b720491ff5c9b4e86e2de8ebce07;p=ffmpeg

diff --git a/libavformat/swf.h b/libavformat/swf.h
index 1b9b7fff35b..affebe9c732 100644
--- a/libavformat/swf.h
+++ b/libavformat/swf.h
@@ -1,7 +1,7 @@
 /*
  * Flash Compatible Streaming Format common header.
- * Copyright (c) 2000 Fabrice Bellard.
- * Copyright (c) 2003 Tinic Uro.
+ * Copyright (c) 2000 Fabrice Bellard
+ * Copyright (c) 2003 Tinic Uro
  *
  * This file is part of FFmpeg.
  *
@@ -20,10 +20,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_SWF_H
-#define FFMPEG_SWF_H
+#ifndef AVFORMAT_SWF_H
+#define AVFORMAT_SWF_H
 
+#include "libavutil/fifo.h"
 #include "avformat.h"
+#include "avio.h"
 #include "riff.h"    /* for CodecTag */
 
 /* should have a generic way to indicate probable size */
@@ -63,28 +65,23 @@
 #include <assert.h>
 
 typedef struct {
-    int audio_stream_index;
-    offset_t duration_pos;
-    offset_t tag_pos;
-
+    int64_t duration_pos;
+    int64_t tag_pos;
+    int64_t vframes_pos;
     int samples_per_frame;
     int sound_samples;
     int swf_frame_number;
     int video_frame_number;
     int frame_rate;
     int tag;
-
-    uint8_t audio_fifo[AUDIO_FIFO_SIZE];
-    int audio_in_pos;
-
-    int video_type;
-    int audio_type;
+    AVFifoBuffer *audio_fifo;
+    AVCodecContext *audio_enc, *video_enc;
 } SWFContext;
 
 static const AVCodecTag swf_codec_tags[] = {
     {CODEC_ID_FLV1, 0x02},
     {CODEC_ID_VP6F, 0x04},
-    {0, 0},
+    {CODEC_ID_NONE,    0},
 };
 
 static const AVCodecTag swf_audio_codec_tags[] = {
@@ -93,7 +90,7 @@ static const AVCodecTag swf_audio_codec_tags[] = {
     {CODEC_ID_MP3,        0x02},
     {CODEC_ID_PCM_S16LE,  0x03},
   //{CODEC_ID_NELLYMOSER, 0x06},
-    {0, 0},
+    {CODEC_ID_NONE,          0},
 };
 
-#endif /* FFMPEG_SWF_H */
+#endif /* AVFORMAT_SWF_H */