RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-03-01 10:11:01 +00:00
Code Issues Projects Releases Wiki Activity

lavfi/lavfutils: switch to the new decoding API

Browse Source
This commit is contained in:
Anton Khirnov 2020-04-18 15:53:18 +02:00
parent 65c4d5d72e
commit e1c4a3ea7d
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavfilter/lavfutils.c
View File

@ -31,7 +31,7 @@ int ff_load_image(uint8_t *data[4], int linesize[4],
AVCodecContext *codec_ctx = NULL; AVCodecContext *codec_ctx = NULL;
AVCodecParameters *par; AVCodecParameters *par;
AVFrame *frame = NULL; AVFrame *frame = NULL;
int frame_decoded, ret = 0; int ret = 0;
AVPacket pkt; AVPacket pkt;
AVDictionary *opt=NULL; AVDictionary *opt=NULL;
@ -86,12 +86,16 @@ int ff_load_image(uint8_t *data[4], int linesize[4],
goto end; goto end;
} }
ret = avcodec_decode_video2(codec_ctx, frame, &frame_decoded, &pkt); ret = avcodec_send_packet(codec_ctx, &pkt);
av_packet_unref(&pkt); av_packet_unref(&pkt);
if (ret < 0 || !frame_decoded) { if (ret < 0) {
av_log(log_ctx, AV_LOG_ERROR, "Error submitting a packet to decoder\n");
goto end;
}
ret = avcodec_receive_frame(codec_ctx, frame);
if (ret < 0) {
av_log(log_ctx, AV_LOG_ERROR, "Failed to decode image from file\n"); av_log(log_ctx, AV_LOG_ERROR, "Failed to decode image from file\n");
if (ret >= 0)
ret = -1;
goto end; goto end;
} }