[FFmpeg-cvslog] avformat/ilbc: Use av_get_packet

Andreas Rheinhardt git at videolan.org
Sat Aug 7 00:02:09 EEST 2021


ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at outlook.com> | Wed Feb  3 08:19:39 2021 +0100| [a3e78deb0a3a0142d333808678b6ee70873ecab7] | committer: Andreas Rheinhardt

avformat/ilbc: Use av_get_packet

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>

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

 libavformat/ilbc.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/libavformat/ilbc.c b/libavformat/ilbc.c
index efa5339089..0cbdd3d5b8 100644
--- a/libavformat/ilbc.c
+++ b/libavformat/ilbc.c
@@ -99,15 +99,11 @@ static int ilbc_read_packet(AVFormatContext *s,
     AVCodecParameters *par = s->streams[0]->codecpar;
     int ret;
 
-    if ((ret = av_new_packet(pkt, par->block_align)) < 0)
-        return ret;
+    if ((ret = av_get_packet(s->pb, pkt, par->block_align)) != par->block_align)
+        return ret < 0 ? ret : AVERROR_INVALIDDATA;
 
     pkt->stream_index = 0;
-    pkt->pos = avio_tell(s->pb);
     pkt->duration = par->block_align == 38 ? 160 : 240;
-    if ((ret = avio_read(s->pb, pkt->data, par->block_align)) != par->block_align) {
-        return ret < 0 ? ret : AVERROR(EIO);
-    }
 
     return 0;
 }



More information about the ffmpeg-cvslog mailing list