| Message ID | 20210312105303.1844599-1-andreas.rheinhardt@gmail.com |
|---|---|
| State | Accepted |
| Commit | d025a5bcc271387e2f3080b88651eddbae9b93d2 |
| Headers | show |
| Series | [FFmpeg-devel,1/2] avformat/adp, svs: Remove redundant av_shrink_packet() | expand |
| Context | Check | Description |
|---|---|---|
| andriy/x86_make | success | Make finished |
| andriy/x86_make_fate | success | Make fate finished |
| andriy/PPC64_make | success | Make finished |
| andriy/PPC64_make_fate | success | Make fate finished |
On 3/12/2021 7:53 AM, Andreas Rheinhardt wrote: > 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. > > Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com> > --- > 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; LGTM.
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;
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. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com> --- libavformat/adp.c | 8 ++------ libavformat/svs.c | 1 - 2 files changed, 2 insertions(+), 7 deletions(-)