diff options
author | Luca Barbato <lu_zero@gentoo.org> | 2011-12-17 14:08:11 +0100 |
---|---|---|
committer | Luca Barbato <lu_zero@gentoo.org> | 2011-12-19 18:31:28 +0100 |
commit | 1c668624725318b62e1ce9adfdbd0417da0a1633 (patch) | |
tree | 7dd19a1566838b6d973a591aae8cf1db346ff4e9 | |
parent | 02e8f03296d29949a7cffc8fa3e704b0efa66f17 (diff) | |
download | ffmpeg-1c668624725318b62e1ce9adfdbd0417da0a1633.tar.gz |
mpegts: rename payload_index to payload_size
It holds the size of the current payload.
-rw-r--r-- | libavformat/mpegtsenc.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c index 32a759c55b..57cfe4552b 100644 --- a/libavformat/mpegtsenc.c +++ b/libavformat/mpegtsenc.c @@ -201,7 +201,7 @@ typedef struct MpegTSWriteStream { struct MpegTSService *service; int pid; /* stream associated pid */ int cc; - int payload_index; + int payload_size; int first_pts_check; ///< first pts check needed int64_t payload_pts; int64_t payload_dts; @@ -1006,21 +1006,21 @@ static int mpegts_write_packet(AVFormatContext *s, AVPacket *pkt) return 0; } - if (ts_st->payload_index + size > DEFAULT_PES_PAYLOAD_SIZE) { - mpegts_write_pes(s, st, ts_st->payload, ts_st->payload_index, + if (ts_st->payload_size + size > DEFAULT_PES_PAYLOAD_SIZE) { + mpegts_write_pes(s, st, ts_st->payload, ts_st->payload_size, ts_st->payload_pts, ts_st->payload_dts, ts_st->payload_flags & AV_PKT_FLAG_KEY); - ts_st->payload_index = 0; + ts_st->payload_size = 0; } - if (!ts_st->payload_index) { + if (!ts_st->payload_size) { ts_st->payload_pts = pts; ts_st->payload_dts = dts; ts_st->payload_flags = pkt->flags; } - memcpy(ts_st->payload + ts_st->payload_index, buf, size); - ts_st->payload_index += size; + memcpy(ts_st->payload + ts_st->payload_size, buf, size); + ts_st->payload_size += size; av_free(data); @@ -1039,8 +1039,8 @@ static int mpegts_write_end(AVFormatContext *s) for(i = 0; i < s->nb_streams; i++) { st = s->streams[i]; ts_st = st->priv_data; - if (ts_st->payload_index > 0) { - mpegts_write_pes(s, st, ts_st->payload, ts_st->payload_index, + if (ts_st->payload_size > 0) { + mpegts_write_pes(s, st, ts_st->payload, ts_st->payload_size, ts_st->payload_pts, ts_st->payload_dts, ts_st->payload_flags & AV_PKT_FLAG_KEY); } |