*/
#include "libavutil/imgutils.h"
+#include "libavformat/avformat.h"
#include "lavfutils.h"
int ff_load_image(uint8_t *data[4], int linesize[4],
int *w, int *h, enum AVPixelFormat *pix_fmt,
const char *filename, void *log_ctx)
{
- AVInputFormat *iformat = NULL;
+ const AVInputFormat *iformat = NULL;
AVFormatContext *format_ctx = NULL;
- AVCodec *codec;
- AVCodecContext *codec_ctx;
+ const AVCodec *codec;
+ AVCodecContext *codec_ctx = NULL;
AVCodecParameters *par;
- AVFrame *frame;
- int frame_decoded, ret = 0;
+ AVFrame *frame = NULL;
+ int ret = 0;
AVPacket pkt;
AVDictionary *opt=NULL;
- av_init_packet(&pkt);
-
iformat = av_find_input_format("image2pipe");
if ((ret = avformat_open_input(&format_ctx, filename, iformat, NULL)) < 0) {
av_log(log_ctx, AV_LOG_ERROR,
if ((ret = avformat_find_stream_info(format_ctx, NULL)) < 0) {
av_log(log_ctx, AV_LOG_ERROR, "Find stream info failed\n");
- return ret;
+ goto end;
}
par = format_ctx->streams[0]->codecpar;
goto end;
}
- ret = avcodec_decode_video2(codec_ctx, frame, &frame_decoded, &pkt);
- if (ret < 0 || !frame_decoded) {
+ ret = avcodec_send_packet(codec_ctx, &pkt);
+ av_packet_unref(&pkt);
+ 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;
}
av_image_copy(data, linesize, (const uint8_t **)frame->data, frame->linesize, *pix_fmt, *w, *h);
end:
- av_packet_unref(&pkt);
avcodec_free_context(&codec_ctx);
avformat_close_input(&format_ctx);
av_frame_free(&frame);