[FFmpeg-devel,6/6] avformat/mpegtsenc: remove deprecated resend_headers option

Submitted by Marton Balint on Aug. 8, 2019, 9:27 p.m.

Details

Message ID 20190808212753.29467-6-cus@passwd.hu
State Accepted
Commit 59744637673d4fc1974e24f5a8e0137d104e16a1
Headers show

Commit Message

Marton Balint Aug. 8, 2019, 9:27 p.m.
Deprecated since 2014.

Signed-off-by: Marton Balint <cus@passwd.hu>
---
 doc/muxers.texi         |  4 ----
 libavformat/mpegtsenc.c | 13 -------------
 2 files changed, 17 deletions(-)

Patch hide | download patch | download mbox

diff --git a/doc/muxers.texi b/doc/muxers.texi
index f9e8b60517..846b5f41db 100644
--- a/doc/muxers.texi
+++ b/doc/muxers.texi
@@ -1611,10 +1611,6 @@  Conform to System B (DVB) instead of System A (ATSC).
 Mark the initial packet of each stream as discontinuity.
 @end table
 
-@item resend_headers @var{integer}
-Reemit PAT/PMT before writing the next packet. This option is deprecated:
-use @option{mpegts_flags} instead.
-
 @item mpegts_copyts @var{boolean}
 Preserve original timestamps, if value is set to @code{1}. Default value
 is @code{-1}, which results in shifting timestamps so that they start from 0.
diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c
index aec2559b14..32f562ecac 100644
--- a/libavformat/mpegtsenc.c
+++ b/libavformat/mpegtsenc.c
@@ -97,8 +97,6 @@  typedef struct MpegTSWrite {
     int start_pid;
     int m2ts_mode;
 
-    int reemit_pat_pmt; // backward compatibility
-
     int pcr_period;
 #define MPEGTS_FLAG_REEMIT_PAT_PMT  0x01
 #define MPEGTS_FLAG_AAC_LATM        0x02
@@ -1530,13 +1528,6 @@  static int mpegts_write_packet_internal(AVFormatContext *s, AVPacket *pkt)
     if (side_data)
         stream_id = side_data[0];
 
-    if (ts->reemit_pat_pmt) {
-        av_log(s, AV_LOG_WARNING,
-               "resend_headers option is deprecated, use -mpegts_flags resend_headers\n");
-        ts->reemit_pat_pmt = 0;
-        ts->flags         |= MPEGTS_FLAG_REEMIT_PAT_PMT;
-    }
-
     if (ts->flags & MPEGTS_FLAG_REEMIT_PAT_PMT) {
         ts->pat_packet_count = ts->pat_packet_period - 1;
         ts->sdt_packet_count = ts->sdt_packet_period - 1;
@@ -1934,10 +1925,6 @@  static const AVOption options[] = {
     { "initial_discontinuity", "Mark initial packets as discontinuous",
       0, AV_OPT_TYPE_CONST, { .i64 = MPEGTS_FLAG_DISCONT }, 0, INT_MAX,
       AV_OPT_FLAG_ENCODING_PARAM, "mpegts_flags" },
-    // backward compatibility
-    { "resend_headers", "Reemit PAT/PMT before writing the next packet",
-      offsetof(MpegTSWrite, reemit_pat_pmt), AV_OPT_TYPE_INT,
-      { .i64 = 0 }, 0, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM },
     { "mpegts_copyts", "don't offset dts/pts",
       offsetof(MpegTSWrite, copyts), AV_OPT_TYPE_BOOL,
       { .i64 = -1 }, -1, 1, AV_OPT_FLAG_ENCODING_PARAM },