[FFmpeg-cvslog] avcodec/decode: ignore unsupported skip samples packet side data values

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


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

avcodec/decode: ignore unsupported skip samples packet side data values

Same as in the AV_FRAME_FLAG_DISCARD codepath, ensure avci->skip_samples is not
negative.

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

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

 libavcodec/decode.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libavcodec/decode.c b/libavcodec/decode.c
index 0912f86a14..4f9b949926 100644
--- a/libavcodec/decode.c
+++ b/libavcodec/decode.c
@@ -366,6 +366,7 @@ static inline int decode_simple_internal(AVCodecContext *avctx, AVFrame *frame,
         side= av_packet_get_side_data(avci->last_pkt_props, AV_PKT_DATA_SKIP_SAMPLES, &side_size);
         if(side && side_size>=10) {
             avci->skip_samples = AV_RL32(side) * avci->skip_samples_multiplier;
+            avci->skip_samples = FFMAX(0, avci->skip_samples);
             discard_padding = AV_RL32(side + 4);
             av_log(avctx, AV_LOG_DEBUG, "skip %d / discard %d samples due to side data\n",
                    avci->skip_samples, (int)discard_padding);



More information about the ffmpeg-cvslog mailing list