fftools/ffmpeg_mux: embed OutputStream in a MuxStream

This is now possible since OutputStream is a child of OutputFile and the
code allocating it can access MuxStream. Avoids the overhead and extra
complexity of allocating two objects instead of one.

Similar to what was previously done for OutputFile/Muxer.

1 files changed, 2 insertions, 3 deletions

diff --git a/fftools/ffmpeg_mux.h b/fftools/ffmpeg_mux.h
index b73b6c628b..45daeb3591 100644
--- a/fftools/ffmpeg_mux.h
+++ b/fftools/ffmpeg_mux.h
@@ -35,6 +35,8 @@
 #include "libavutil/thread.h"
 
 typedef struct MuxStream {
+    OutputStream ost;
+
     /* the packets are buffered here until the muxer is ready to be initialized */
     AVFifo *muxing_queue;
 
@@ -57,9 +59,6 @@ typedef struct Muxer {
     pthread_t    thread;
     ThreadQueue *tq;
 
-    MuxStream *streams;
-    int     nb_streams;
-
     AVDictionary *opts;
 
     int thread_queue_size;