This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg.
commit 378928e79f40f828577fd8e34dc0be9989c5f888 Author: Andreas Rheinhardt <[email protected]> AuthorDate: Sat Feb 21 15:02:43 2026 +0100 Commit: Andreas Rheinhardt <[email protected]> CommitDate: Tue Mar 10 13:52:18 2026 +0100 avformat/mpegtsenc: Fix shadowing Signed-off-by: Andreas Rheinhardt <[email protected]> --- libavformat/mpegtsenc.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c index 96cdea955e..3578c3fd46 100644 --- a/libavformat/mpegtsenc.c +++ b/libavformat/mpegtsenc.c @@ -1878,15 +1878,13 @@ static int mpegts_write_packet_internal(AVFormatContext *s, AVPacket *pkt) const int64_t max_audio_delay = av_rescale(s->max_delay, 90000, AV_TIME_BASE) / 2; int64_t dts = pkt->dts, pts = pkt->pts; int opus_samples = 0; - size_t side_data_size; - uint8_t *side_data = NULL; int stream_id = -1; - side_data = av_packet_get_side_data(pkt, - AV_PKT_DATA_MPEGTS_STREAM_ID, - &side_data_size); - if (side_data) - stream_id = side_data[0]; + uint8_t *stream_id_p = av_packet_get_side_data(pkt, + AV_PKT_DATA_MPEGTS_STREAM_ID, + NULL); + if (stream_id_p) + stream_id = stream_id_p[0]; if (!ts->first_dts_checked && dts != AV_NOPTS_VALUE) { ts->first_pcr += dts * SYSTEM_CLOCK_FREQUENCY_DIVISOR; _______________________________________________ ffmpeg-cvslog mailing list -- [email protected] To unsubscribe send an email to [email protected]
