summaryrefslogtreecommitdiff
path: root/ffserver.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2011-06-18 13:40:48 +0200
committerAnton Khirnov <anton@khirnov.net>2011-07-10 17:09:28 +0200
commit71a861cf4010ab835fab383a250f27903eb61a34 (patch)
tree5af1c2668613d3cd606b9803f34ac68c22152228 /ffserver.c
parent18c007ba37b2c7dee5bd2f1a3eb3bfee9b6b3d26 (diff)
lavc: make avcodec_alloc_context3 officially public.
Deprecate avcodec_alloc_context/2.
Diffstat (limited to 'ffserver.c')
-rw-r--r--ffserver.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ffserver.c b/ffserver.c
index a12d7082b6..1dc8a17f2f 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -3468,7 +3468,7 @@ static AVStream *add_av_stream1(FFStream *stream, AVCodecContext *codec, int cop
if (!fst)
return NULL;
if (copy) {
- fst->codec= avcodec_alloc_context();
+ fst->codec = avcodec_alloc_context3(NULL);
memcpy(fst->codec, codec, sizeof(AVCodecContext));
if (codec->extradata_size) {
fst->codec->extradata = av_malloc(codec->extradata_size);
@@ -3885,7 +3885,7 @@ static void add_codec(FFStream *stream, AVCodecContext *av)
st = av_mallocz(sizeof(AVStream));
if (!st)
return;
- st->codec = avcodec_alloc_context();
+ st->codec = avcodec_alloc_context3(NULL);
stream->streams[stream->nb_streams++] = st;
memcpy(st->codec, av, sizeof(AVCodecContext));
}