diff options
| author | Tim Redfern <tim@eclectronics.org> | 2014-02-17 13:36:38 +0000 |
|---|---|---|
| committer | Tim Redfern <tim@eclectronics.org> | 2014-02-17 13:36:38 +0000 |
| commit | 22e28216336da876e1fd17f380ce42eaf1446769 (patch) | |
| tree | 444dad3dc7e2656992d29f34f7bce31970c122a5 /ffmpeg/libavfilter/lavfutils.c | |
| parent | ae5e8541f6e06e64c28719467cdf366ac57aff31 (diff) | |
chasing indexing error
Diffstat (limited to 'ffmpeg/libavfilter/lavfutils.c')
| -rw-r--r-- | ffmpeg/libavfilter/lavfutils.c | 98 |
1 files changed, 0 insertions, 98 deletions
diff --git a/ffmpeg/libavfilter/lavfutils.c b/ffmpeg/libavfilter/lavfutils.c deleted file mode 100644 index 58d98cf..0000000 --- a/ffmpeg/libavfilter/lavfutils.c +++ /dev/null @@ -1,98 +0,0 @@ -/* - * Copyright 2012 Stefano Sabatini <stefasab gmail com> - * - * This file is part of FFmpeg. - * - * FFmpeg is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * FFmpeg is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include "libavutil/imgutils.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; - AVFormatContext *format_ctx = NULL; - AVCodec *codec; - AVCodecContext *codec_ctx; - AVFrame *frame; - int frame_decoded, ret = 0; - AVPacket pkt; - - av_init_packet(&pkt); - - av_register_all(); - - iformat = av_find_input_format("image2"); - if ((ret = avformat_open_input(&format_ctx, filename, iformat, NULL)) < 0) { - av_log(log_ctx, AV_LOG_ERROR, - "Failed to open input file '%s'\n", filename); - return ret; - } - - codec_ctx = format_ctx->streams[0]->codec; - codec = avcodec_find_decoder(codec_ctx->codec_id); - if (!codec) { - av_log(log_ctx, AV_LOG_ERROR, "Failed to find codec\n"); - ret = AVERROR(EINVAL); - goto end; - } - - if ((ret = avcodec_open2(codec_ctx, codec, NULL)) < 0) { - av_log(log_ctx, AV_LOG_ERROR, "Failed to open codec\n"); - goto end; - } - - if (!(frame = av_frame_alloc()) ) { - av_log(log_ctx, AV_LOG_ERROR, "Failed to alloc frame\n"); - ret = AVERROR(ENOMEM); - goto end; - } - - ret = av_read_frame(format_ctx, &pkt); - if (ret < 0) { - av_log(log_ctx, AV_LOG_ERROR, "Failed to read frame from file\n"); - goto end; - } - - ret = avcodec_decode_video2(codec_ctx, frame, &frame_decoded, &pkt); - if (ret < 0 || !frame_decoded) { - av_log(log_ctx, AV_LOG_ERROR, "Failed to decode image from file\n"); - goto end; - } - ret = 0; - - *w = frame->width; - *h = frame->height; - *pix_fmt = frame->format; - - if ((ret = av_image_alloc(data, linesize, *w, *h, *pix_fmt, 16)) < 0) - goto end; - ret = 0; - - av_image_copy(data, linesize, (const uint8_t **)frame->data, frame->linesize, *pix_fmt, *w, *h); - -end: - av_free_packet(&pkt); - avcodec_close(codec_ctx); - avformat_close_input(&format_ctx); - av_freep(&frame); - - if (ret < 0) - av_log(log_ctx, AV_LOG_ERROR, "Error loading image file '%s'\n", filename); - return ret; -} |
