[FFmpeg-cvslog] avformat/demux: don't propagate unsupported skip samples packet side data values

James Almer git at videolan.org
Sat Feb 5 14:46:21 EET 2022


ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Mon Jan 31 22:56:45 2022 -0300| [3b9bd63ad92967e06d5e2f67e0cfd9093bf7700d] | committer: James Almer

avformat/demux: don't propagate unsupported skip samples packet side data values

Should fix ticket #9622

Signed-off-by: James Almer <jamrial at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3b9bd63ad92967e06d5e2f67e0cfd9093bf7700d
---

 libavformat/demux.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libavformat/demux.c b/libavformat/demux.c
index f895f0ba85..09d539af68 100644
--- a/libavformat/demux.c
+++ b/libavformat/demux.c
@@ -1354,6 +1354,7 @@ static int read_frame_internal(AVFormatContext *s, AVPacket *pkt)
         }
         if (sti->start_skip_samples && (pkt->pts == 0 || pkt->pts == RELATIVE_TS_BASE))
             sti->skip_samples = sti->start_skip_samples;
+        sti->skip_samples = FFMAX(0, sti->skip_samples);
         if (sti->skip_samples || discard_padding) {
             uint8_t *p = av_packet_new_side_data(pkt, AV_PKT_DATA_SKIP_SAMPLES, 10);
             if (p) {



More information about the ffmpeg-cvslog mailing list