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

vsrc_movie: convert to codecpar

Browse Source
This commit is contained in:
Anton Khirnov
2016-02-10 14:17:21 +01:00
parent ac6d53589f
commit 1138eb5509
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
libavfilter/vsrc_movie.c
View File

@@ -86,6 +86,7 @@ static av_cold int movie_init(AVFilterContext *ctx)
{ {
MovieContext *movie = ctx->priv; MovieContext *movie = ctx->priv;
AVInputFormat *iformat = NULL; AVInputFormat *iformat = NULL;
AVStream *st;
AVCodec *codec; AVCodec *codec;
int ret; int ret;
int64_t timestamp; int64_t timestamp;
@@ -132,18 +133,26 @@ static av_cold int movie_init(AVFilterContext *ctx)
return ret; return ret;
} }
movie->stream_index = ret; movie->stream_index = ret;
movie->codec_ctx = movie->format_ctx->streams[movie->stream_index]->codec; st = movie->format_ctx->streams[movie->stream_index];
/* /*
* So now we've got a pointer to the so-called codec context for our video * So now we've got a pointer to the so-called codec context for our video
* stream, but we still have to find the actual codec and open it. * stream, but we still have to find the actual codec and open it.
*/ */
codec = avcodec_find_decoder(movie->codec_ctx->codec_id); codec = avcodec_find_decoder(st->codecpar->codec_id);
if (!codec) { if (!codec) {
av_log(ctx, AV_LOG_ERROR, "Failed to find any codec\n"); av_log(ctx, AV_LOG_ERROR, "Failed to find any codec\n");
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }
movie->codec_ctx = avcodec_alloc_context3(codec);
if (!movie->codec_ctx)
return AVERROR(ENOMEM);
ret = avcodec_parameters_to_context(movie->codec_ctx, st->codecpar);
if (ret < 0)
return ret;
movie->codec_ctx->refcounted_frames = 1; movie->codec_ctx->refcounted_frames = 1;
if ((ret = avcodec_open2(movie->codec_ctx, codec, NULL)) < 0) { if ((ret = avcodec_open2(movie->codec_ctx, codec, NULL)) < 0) {
@@ -174,8 +183,7 @@ static av_cold void uninit(AVFilterContext *ctx)
{ {
MovieContext *movie = ctx->priv; MovieContext *movie = ctx->priv;
if (movie->codec_ctx) avcodec_free_context(&movie->codec_ctx);
avcodec_close(movie->codec_ctx);
if (movie->format_ctx) if (movie->format_ctx)
avformat_close_input(&movie->format_ctx); avformat_close_input(&movie->format_ctx);
av_frame_free(&movie->frame); av_frame_free(&movie->frame);