diff options
| author | Marton Balint <cus@passwd.hu> | 2019-08-08 09:25:31 +0200 |
|---|---|---|
| committer | Marton Balint <cus@passwd.hu> | 2019-08-14 23:25:28 +0200 |
| commit | 59744637673d4fc1974e24f5a8e0137d104e16a1 (patch) | |
| tree | 64e112a3fe8953a4924c70c9d923a2530d5ede6e | |
| parent | 88ac76be796025dfa7cc55124e881fbc59b7377a (diff) | |
avformat/mpegtsenc: remove deprecated resend_headers option
Deprecated since 2014.
Signed-off-by: Marton Balint <cus@passwd.hu>
| -rw-r--r-- | doc/muxers.texi | 4 | ||||
| -rw-r--r-- | libavformat/mpegtsenc.c | 13 |
2 files changed, 0 insertions, 17 deletions
diff --git a/doc/muxers.texi b/doc/muxers.texi index bc38cf6029..019eee6145 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 59516e0c96..d4dd4abb12 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 @@ -1558,13 +1556,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; @@ -1962,10 +1953,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 }, |