fftools/ffmpeg: merge DemuxPktData into FrameData

This way we can propagate arbitrary data from the demuxer all the way
into the muxer, using a single struct.

1 files changed, 7 insertions, 6 deletions

diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h
index ba82b7490d..aafb35538e 100644
--- a/fftools/ffmpeg.h
+++ b/fftools/ffmpeg.h
@@ -115,12 +115,6 @@ typedef struct {
 } AudioChannelMap;
 #endif
 
-typedef struct DemuxPktData {
-    // estimated dts in AV_TIME_BASE_Q,
-    // to be used when real dts is missing
-    int64_t dts_est;
-} DemuxPktData;
-
 typedef struct OptionsContext {
     OptionGroup *g;
 
@@ -622,6 +616,10 @@ typedef struct OutputFile {
 
 // optionally attached as opaque_ref to decoded AVFrames
 typedef struct FrameData {
+    // demuxer-estimated dts in AV_TIME_BASE_Q,
+    // to be used when real dts is missing
+    int64_t dts_est;
+
     // properties that come from the decoder
     struct {
         uint64_t   frame_num;
@@ -723,6 +721,9 @@ FrameData *frame_data(AVFrame *frame);
 
 const FrameData *frame_data_c(AVFrame *frame);
 
+FrameData       *packet_data  (AVPacket *pkt);
+const FrameData *packet_data_c(AVPacket *pkt);
+
 /**
  * Set up fallback filtering parameters from a decoder context. They will only
  * be used if no frames are ever sent on this input, otherwise the actual