tmp

diff --git a/simp.h b/simp.h
index 0f44cf8772b597073de89e424e7f5c5ae0466fce..ca63afb9835e06a0ab821fd126284261df2c3ad5 100644 (file)
--- a/simp.h
+++ b/simp.h
@@ -26,6 +26,25 @@ struct simp_frame_s
        AVFrame*             frame;
 };
 
+typedef struct {
+       AVFormatContext*  fmt_ctx;
+       AVCodecContext*   vcodec_ctx;
+       AVCodecContext*   acodec_ctx;
+
+       AVAudioFifo*      afifo;
+
+       int               vidx;
+       int               aidx;
+
+       int               nb_samples;
+
+       AVFrame*          vframe;
+       AVFrame*          aframe;
+       AVPacket*         vpkt;
+       AVPacket*         apkt;
+
+} simp_ffmpeg_t;
+
 struct  simp_avio_s
 {
        scf_list_t           list;

diff --git a/simp_ffmpeg.h b/simp_ffmpeg.h
index 945b05d694f282f84cf7a2a656b7164f038dc0bc..081f73ac7320e5859618bd1a3ed147e427109c34 100644 (file)
--- a/simp_ffmpeg.h
+++ b/simp_ffmpeg.h
@@ -3,24 +3,6 @@
 
 #include"simp.h"
 
-typedef struct {
-       AVFormatContext*  fmt_ctx;
-       AVCodecContext*   vcodec_ctx;
-       AVCodecContext*   acodec_ctx;
-
-       AVAudioFifo*      afifo;
-
-       int               vidx;
-       int               aidx;
-
-       int               nb_samples;
-
-       AVFrame*          vframe;
-       AVFrame*          aframe;
-       AVPacket*         vpkt;
-       AVPacket*         apkt;
-
-} simp_ffmpeg_t;
 
 #endif