Commit a336a7edd3 for ffmpeg
commit a336a7edd37e2deb50657095dd9a709bc7ff426a
Author: Michael Niedermayer <michael@niedermayer.cc>
Date: Wed Nov 11 18:46:15 2026 +0100
avformat/mpegts: remove unused PESContext.merged_st
mpegts_close_filter() no longer reads it.
diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c
index bffa78a701..8e6d175e9a 100644
--- a/libavformat/mpegts.c
+++ b/libavformat/mpegts.c
@@ -296,7 +296,6 @@ typedef struct PESContext {
uint8_t header[MAX_PES_HEADER_SIZE];
AVBufferRef *buffer;
SLConfigDescr sl;
- int merged_st;
} PESContext;
EXTERN const FFInputFormat ff_mpegts_demuxer;
@@ -2897,7 +2896,6 @@ static void pmt_cb(MpegTSFilter *filter, const uint8_t *section, int section_len
if (st) {
pes->st = st;
pes->stream_type = stream_type;
- pes->merged_st = 1;
}
}
if (!pes->st) {
@@ -2916,7 +2914,6 @@ static void pmt_cb(MpegTSFilter *filter, const uint8_t *section, int section_len
if (st) {
pes->st = st;
pes->stream_type = stream_type;
- pes->merged_st = 1;
}
}
if (pes && !pes->st) {