rtpproto: Add an option for writing return packets to the address of the last receive...

[ffmpeg] / libavformat / swf.h

diff --git a/libavformat/swf.h b/libavformat/swf.h
index 14330c1e088bb8a7cbba3212e5e9d36ba9f27d1f..79c3c1d033e7e88579f8cccbc08dc67d62341f6d 100644 (file)
--- a/libavformat/swf.h
+++ b/libavformat/swf.h
@@ -26,7 +26,7 @@
 #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)
@@ -64,7 +64,7 @@
 #undef NDEBUG
 #include <assert.h>
 
-typedef struct {
+typedef struct SWFContext {
     int64_t duration_pos;
     int64_t tag_pos;
     int64_t vframes_pos;
@@ -78,19 +78,6 @@ typedef struct {
     AVCodecContext *audio_enc, *video_enc;
 } SWFContext;
 
-static const AVCodecTag swf_codec_tags[] = {
-    { AV_CODEC_ID_FLV1, 0x02},
-    { AV_CODEC_ID_VP6F, 0x04},
-    { AV_CODEC_ID_NONE,    0},
-};
-
-static const AVCodecTag swf_audio_codec_tags[] = {
-    { AV_CODEC_ID_PCM_S16LE,  0x00},
-    { AV_CODEC_ID_ADPCM_SWF,  0x01},
-    { AV_CODEC_ID_MP3,        0x02},
-    { AV_CODEC_ID_PCM_S16LE,  0x03},
-  //{ AV_CODEC_ID_NELLYMOSER, 0x06},
-    { AV_CODEC_ID_NONE,          0},
-};
+extern const AVCodecTag ff_swf_codec_tags[];
 
 #endif /* AVFORMAT_SWF_H */