diff mbox series

[FFmpeg-devel,1/2] avformat/avformat: remove AVFormatContext.ts_id

Message ID 20240304180613.7280-2-jamrial@gmail.com
State Accepted
Commit 53cdf94653d8bbe5af4899a6808097bd07c38f79
Headers show
Series [FFmpeg-devel,1/2] avformat/avformat: remove AVFormatContext.ts_id | expand

Checks

Context Check Description
yinshiyou/make_loongarch64 success Make finished
yinshiyou/make_fate_loongarch64 success Make fate finished
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished

Commit Message

James Almer March 4, 2024, 6:06 p.m. UTC 
It's been replaced by a demuxer exported private option.

Signed-off-by: James Almer <jamrial@gmail.com>
---
 libavformat/avformat.h | 6 ------
 libavformat/mpegts.c   | 2 +-
 2 files changed, 1 insertion(+), 7 deletions(-)
diff mbox series

Patch

diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 1ae4c37d45..d74db17df1 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -1591,12 +1591,6 @@  typedef struct AVFormatContext {
 #define AVFMT_AVOID_NEG_TS_MAKE_NON_NEGATIVE 1 ///< Shift timestamps so they are non negative
 #define AVFMT_AVOID_NEG_TS_MAKE_ZERO         2 ///< Shift timestamps so that they start at 0
 
-    /**
-     * Transport stream id.
-     * This will be moved into demuxer private options. Thus no API/ABI compatibility
-     */
-    int ts_id;
-
     /**
      * Audio preload in microseconds.
      * Note, not all formats support this and unpredictable things may happen if it is used when not supported.
diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c
index d4fe03bb67..de7a3c8b45 100644
--- a/libavformat/mpegts.c
+++ b/libavformat/mpegts.c
@@ -2561,7 +2561,7 @@  static void pat_cb(MpegTSFilter *filter, const uint8_t *section, int section_len
 
     if (skip_identical(h, tssf))
         return;
-    ts->stream->ts_id = ts->id = h->id;
+    ts->id = h->id;
 
     for (;;) {
         sid = get16(&p, p_end);