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 /ffserver.c | |
| 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 'ffserver.c')
| -rw-r--r-- | ffserver.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ffserver.c b/ffserver.c index 65a97b20cc..179cac4d96 100644 --- a/ffserver.c +++ b/ffserver.c @@ -2116,7 +2116,7 @@ static void open_parser(AVFormatContext *s, int i) codec = avcodec_find_decoder(st->codec->codec_id); if (codec && (codec->capabilities & CODEC_CAP_PARSE_ONLY)) { st->codec->parse_only = 1; - if (avcodec_open(st->codec, codec) < 0) + if (avcodec_open2(st->codec, codec, NULL) < 0) st->codec->parse_only = 0; } } |