ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinha...@gmail.com> | Fri Mar 12 09:23:46 2021 +0100| [d025a5bcc271387e2f3080b88651eddbae9b93d2] | committer: Andreas Rheinhardt
avformat/adp, svs: Remove redundant av_shrink_packet() av_get_packet() already makes sure that the packet size is accurate and that the packet data is zero-padded even when one could not read as much as desired. Reviewed-by: James Almer <jamr...@gmail.com> Signed-off-by: Andreas Rheinhardt <andreas.rheinha...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d025a5bcc271387e2f3080b88651eddbae9b93d2 --- libavformat/adp.c | 8 ++------ libavformat/svs.c | 1 - 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/libavformat/adp.c b/libavformat/adp.c index 8668c78fe4..b0ee09753e 100644 --- a/libavformat/adp.c +++ b/libavformat/adp.c @@ -75,13 +75,9 @@ static int adp_read_packet(AVFormatContext *s, AVPacket *pkt) return AVERROR_EOF; ret = av_get_packet(s->pb, pkt, size); + if (ret < 0) + return ret; - if (ret != size) { - if (ret < 0) { - return ret; - } - av_shrink_packet(pkt, ret); - } pkt->stream_index = 0; return ret; diff --git a/libavformat/svs.c b/libavformat/svs.c index d4285ed306..8be26c5bc3 100644 --- a/libavformat/svs.c +++ b/libavformat/svs.c @@ -79,7 +79,6 @@ static int svs_read_packet(AVFormatContext *s, AVPacket *pkt) if (ret != 32 * 256) { if (ret < 0) return ret; - av_shrink_packet(pkt, ret); pkt->flags &= ~AV_PKT_FLAG_CORRUPT; } pkt->stream_index = 0; _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
