apps/ffmpeg-rockchip
1
0
Fork 0
mirror of https://github.com/nyanmisaka/ffmpeg-rockchip.git synced 2025-10-13 04:24:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

avformat: Use ffio_read_size where appropriate

Browse Source 
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt
2021-08-06 22:47:22 +02:00
parent dccd1d2a58
commit d1ac645636
8 changed files with 27 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/utils.c
View File

@@ -3285,12 +3285,12 @@ int ff_get_extradata(AVFormatContext *s, AVCodecParameters *par, AVIOContext *pb
int ret = ff_alloc_extradata(par, size);
if (ret < 0)
return ret;
ret = avio_read(pb, par->extradata, size);
if (ret != size) {
ret = ffio_read_size(pb, par->extradata, size);
if (ret < 0) {
av_freep(&par->extradata);
par->extradata_size = 0;
av_log(s, AV_LOG_ERROR, "Failed to read extradata of size %d\n", size);
return ret < 0 ? ret : AVERROR_INVALIDDATA;
return ret;
}
return ret;