diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-05-22 16:10:49 +0400 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2011-11-19 13:22:26 +0400 |
| commit | 47953c33ea8dc3b5da1903b0c5055043b82db3e7 (patch) | |
| tree | 12e62a1a1eda770305ae3d4e4d24aadbb03d5334 /libavfilter | |
| parent | 58decdb639e8582063807b5ddfb86dada6731f74 (diff) | |
lavc: introduce avcodec_open2() as a replacement for avcodec_open().
Adds support for decoder-private options and makes setting other options
simpler.
(cherry picked from commit 0b950fe240936fa48fd41204bcfd04f35bbf39c3)
Conflicts:
libavcodec/avcodec.h
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Diffstat (limited to 'libavfilter')
| -rw-r--r-- | libavfilter/vsrc_movie.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavfilter/vsrc_movie.c b/libavfilter/vsrc_movie.c index 7556fa2e9e..bd74f95545 100644 --- a/libavfilter/vsrc_movie.c +++ b/libavfilter/vsrc_movie.c @@ -139,7 +139,7 @@ static int movie_init(AVFilterContext *ctx) return AVERROR(EINVAL); } - if ((ret = avcodec_open(movie->codec_ctx, codec)) < 0) { + if ((ret = avcodec_open2(movie->codec_ctx, codec, NULL)) < 0) { av_log(ctx, AV_LOG_ERROR, "Failed to open codec\n"); return ret; } |