summaryrefslogtreecommitdiff
path: root/libavfilter/lavfutils.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2020-04-18 15:53:18 +0200
committerAnton Khirnov <anton@khirnov.net>2020-11-20 15:20:24 +0100
commite1c4a3ea7d2830a2e6c1e5212066c7995fffbdf2 (patch)
treea4a626f2a1c62d1ce1e6ef32bbad7fd908f227fb /libavfilter/lavfutils.c
parent65c4d5d72eb4999dd4325972c80f1e2746934458 (diff)
downloadffmpeg-e1c4a3ea7d2830a2e6c1e5212066c7995fffbdf2.tar.gz
lavfi/lavfutils: switch to the new decoding API
Diffstat (limited to 'libavfilter/lavfutils.c')
-rw-r--r--libavfilter/lavfutils.c14
1 files changed, 9 insertions, 5 deletions
diff --git a/libavfilter/lavfutils.c b/libavfilter/lavfutils.c
index a2085ed5ef..f8f8415c80 100644
--- a/libavfilter/lavfutils.c
+++ b/libavfilter/lavfutils.c
@@ -31,7 +31,7 @@ int ff_load_image(uint8_t *data[4], int linesize[4],
AVCodecContext *codec_ctx = NULL;
AVCodecParameters *par;
AVFrame *frame = NULL;
- int frame_decoded, ret = 0;
+ int ret = 0;
AVPacket pkt;
AVDictionary *opt=NULL;
@@ -86,12 +86,16 @@ int ff_load_image(uint8_t *data[4], int linesize[4],
goto end;
}
- ret = avcodec_decode_video2(codec_ctx, frame, &frame_decoded, &pkt);
+ ret = avcodec_send_packet(codec_ctx, &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");
- if (ret >= 0)
- ret = -1;
goto end;
}