summaryrefslogtreecommitdiff
path: root/libavformat/mpegtsenc.c
diff options
context:
space:
mode:
authorAlex Shumsky <alexthreed@gmail.com>2021-10-21 17:58:02 +0300
committerMarton Balint <cus@passwd.hu>2021-11-06 20:35:39 +0100
commit1728127e8c9407d688943c46f8a0524b8870a9b2 (patch)
tree8aee75fa6a6f5ef7cd53f1f986d5e2fa03fd57a8 /libavformat/mpegtsenc.c
parenta085418303a2e736181919429e9b43c06e916f69 (diff)
downloadffmpeg-1728127e8c9407d688943c46f8a0524b8870a9b2.tar.gz
avformat/mpegtsenc: do not include adaptation field in teletext TS packets
From ETSI EN 300 472 V1.3.1 (2003-05) Specification for conveying ITU-R System B Teletext in DVB bitstreams: 4.1 Transport Stream (TS) packet format The standard TS packet syntax and semantics are followed, noting the following constraint: - adaptation_field_control only the values "01" and "10" are permitted. Some set top boxes (Motorola, Arris, Zyxel) refuse non-conforming packets. Signed-off-by: Alex Shumsky <alexthreed@gmail.com> Signed-off-by: Marton Balint <cus@passwd.hu>
Diffstat (limited to 'libavformat/mpegtsenc.c')
-rw-r--r--libavformat/mpegtsenc.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c
index fe2e742c15..e3fba54939 100644
--- a/libavformat/mpegtsenc.c
+++ b/libavformat/mpegtsenc.c
@@ -1564,7 +1564,8 @@ static void mpegts_write_pes(AVFormatContext *s, AVStream *st,
q = get_ts_payload_start(buf);
ts_st->discontinuity = 0;
}
- if (key && is_start && pts != AV_NOPTS_VALUE) {
+ if (key && is_start && pts != AV_NOPTS_VALUE &&
+ !is_dvb_teletext /* adaptation+payload forbidden for teletext (ETSI EN 300 472 V1.3.1 4.1) */) {
// set Random Access for key frames
if (ts_st->pcr_period)
write_pcr = 1;