aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/mpegtsenc.c
diff options
context:
space:
mode:
authorLuca Barbato <lu_zero@gentoo.org>2014-08-03 19:27:07 +0200
committerDiego Biurrun <diego@biurrun.de>2014-08-13 13:53:20 -0700
commit23376ae2f0247ff659724b6a5313639db0c991ad (patch)
treed0cf303d85914ab198c8e333eb7eb593a95a3f47 /libavformat/mpegtsenc.c
parent8231764784a405f546e9c427a6de22d3f4de5c35 (diff)
downloadffmpeg-23376ae2f0247ff659724b6a5313639db0c991ad.tar.gz
mpegts: Define the section length with a constant
The specification says the value is expressed in 10 bits including the 4-byte CRC. (cherry picked from commit 89616408e38ac7257e36976723df0e23d6ee1157) Signed-off-by: Diego Biurrun <diego@biurrun.de> Conflicts: libavformat/mpegtsenc.c
Diffstat (limited to 'libavformat/mpegtsenc.c')
-rw-r--r--libavformat/mpegtsenc.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c
index 8efd93ef31..102620074f 100644
--- a/libavformat/mpegtsenc.c
+++ b/libavformat/mpegtsenc.c
@@ -88,6 +88,10 @@ typedef struct MpegTSWrite {
#define DEFAULT_PES_HEADER_FREQ 16
#define DEFAULT_PES_PAYLOAD_SIZE ((DEFAULT_PES_HEADER_FREQ - 1) * 184 + 170)
+/* The section length is 12 bits. The first 2 are set to 0, the remaining
+ * 10 bits should not exceed 1021. */
+#define SECTION_LENGTH 1020
+
static const AVOption options[] = {
{ "mpegts_transport_stream_id", "Set transport_stream_id field.",
offsetof(MpegTSWrite, transport_stream_id), AV_OPT_TYPE_INT, {.i64 = 0x0001 }, 0x0001, 0xffff, AV_OPT_FLAG_ENCODING_PARAM},
@@ -234,7 +238,7 @@ static void mpegts_write_pat(AVFormatContext *s)
{
MpegTSWrite *ts = s->priv_data;
MpegTSService *service;
- uint8_t data[1012], *q;
+ uint8_t data[SECTION_LENGTH], *q;
int i;
q = data;
@@ -250,7 +254,7 @@ static void mpegts_write_pat(AVFormatContext *s)
static void mpegts_write_pmt(AVFormatContext *s, MpegTSService *service)
{
MpegTSWrite *ts = s->priv_data;
- uint8_t data[1012], *q, *desc_length_ptr, *program_info_length_ptr;
+ uint8_t data[SECTION_LENGTH], *q, *desc_length_ptr, *program_info_length_ptr;
int val, stream_type, i;
q = data;
@@ -405,7 +409,7 @@ static void mpegts_write_sdt(AVFormatContext *s)
{
MpegTSWrite *ts = s->priv_data;
MpegTSService *service;
- uint8_t data[1012], *q, *desc_list_len_ptr, *desc_len_ptr;
+ uint8_t data[SECTION_LENGTH], *q, *desc_list_len_ptr, *desc_len_ptr;
int i, running_status, free_ca_mode, val;
q = data;