highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/utils: simplify, remove duplicate code

Browse Source 
Reviewed-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Signed-off-by: Limin Wang <lance.lmwang@gmail.com>
This commit is contained in:
Limin Wang
2020-04-30 18:29:48 +08:00
parent ab7bcfb80c
commit 79e3c4dd74
1 changed files with 3 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
libavcodec/utils.c
View File

@ -584,37 +584,14 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec *code
avctx->internal = avci; avctx->internal = avci;
avci->to_free = av_frame_alloc(); avci->to_free = av_frame_alloc();
if (!avci->to_free) {
ret = AVERROR(ENOMEM);
goto free_and_end;
}
avci->compat_decode_frame = av_frame_alloc(); avci->compat_decode_frame = av_frame_alloc();
if (!avci->compat_decode_frame) {
ret = AVERROR(ENOMEM);
goto free_and_end;
}
avci->buffer_frame = av_frame_alloc(); avci->buffer_frame = av_frame_alloc();
if (!avci->buffer_frame) {
ret = AVERROR(ENOMEM);
goto free_and_end;
}
avci->buffer_pkt = av_packet_alloc(); avci->buffer_pkt = av_packet_alloc();
if (!avci->buffer_pkt) {
ret = AVERROR(ENOMEM);
goto free_and_end;
}
avci->ds.in_pkt = av_packet_alloc(); avci->ds.in_pkt = av_packet_alloc();
if (!avci->ds.in_pkt) {
ret = AVERROR(ENOMEM);
goto free_and_end;
}
avci->last_pkt_props = av_packet_alloc(); avci->last_pkt_props = av_packet_alloc();
if (!avci->last_pkt_props) { if (!avci->to_free || !avci->compat_decode_frame ||
!avci->buffer_frame || !avci->buffer_pkt ||
!avci->ds.in_pkt || !avci->last_pkt_props) {
ret = AVERROR(ENOMEM); ret = AVERROR(ENOMEM);
goto free_and_end; goto free_and_end;
} }