dxva2: Adjust printf length modifiers where appropriate

[ffmpeg] / libavformat / swf.h

diff --git a/libavformat/swf.h b/libavformat/swf.h
index 97e7b2d4f085f66b3c2434bc84384b16b884ac3a..9b90251e9b57bf6eb4e2fd45b0702702d5de3683 100644 (file)
--- a/libavformat/swf.h
+++ b/libavformat/swf.h
@@ -23,10 +23,16 @@
 #ifndef AVFORMAT_SWF_H
 #define AVFORMAT_SWF_H
 
+#include "config.h"
+
+#if CONFIG_ZLIB
+#include <zlib.h>
+#endif
+
 #include "libavutil/fifo.h"
 #include "avformat.h"
 #include "avio.h"
-#include "riff.h"    /* for CodecTag */
+#include "internal.h"
 
 /* should have a generic way to indicate probable size */
 #define DUMMY_FILE_SIZE   (100 * 1024 * 1024)
@@ -61,9 +67,6 @@
 #define VIDEO_ID 0
 #define SHAPE_ID  1
 
-#undef NDEBUG
-#include <assert.h>
-
 typedef struct SWFContext {
     int64_t duration_pos;
     int64_t tag_pos;
@@ -75,7 +78,15 @@ typedef struct SWFContext {
     int frame_rate;
     int tag;
     AVFifoBuffer *audio_fifo;
-    AVCodecContext *audio_enc, *video_enc;
+    AVCodecParameters *audio_par, *video_par;
+    AVStream *video_st;
+#if CONFIG_ZLIB
+#define ZBUF_SIZE 4096
+    AVIOContext *zpb;
+    uint8_t *zbuf_in;
+    uint8_t *zbuf_out;
+    z_stream zstream;
+#endif
 } SWFContext;
 
 extern const AVCodecTag ff_swf_codec_tags[];