diff options
author | Anton Khirnov <anton@khirnov.net> | 2011-10-08 10:47:47 +0400 |
---|---|---|
committer | Anton Khirnov <anton@khirnov.net> | 2011-10-19 19:02:11 +0400 |
commit | f0eeff708ab5add2d4e8aec9b10683d71b4802be (patch) | |
tree | 01a97a9c3d2bd614729377c9f7d7f65a9ad0b198 /libavcodec/options.c | |
parent | 84ad31ff180fa089cd6bfd93c246336a16036455 (diff) |
lavc: make avcodec_get_context_defaults3 "officially" public
Deprecate avcodec_get_context_defaults/avcodec_get_context_defaults2
Diffstat (limited to 'libavcodec/options.c')
-rw-r--r-- | libavcodec/options.c | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/libavcodec/options.c b/libavcodec/options.c index 75a116450e..65d57d3d23 100644 --- a/libavcodec/options.c +++ b/libavcodec/options.c @@ -531,30 +531,32 @@ static const AVClass av_codec_context_class = { .child_class_next = codec_child_class_next, }; +#if FF_API_ALLOC_CONTEXT void avcodec_get_context_defaults2(AVCodecContext *s, enum AVMediaType codec_type){ + avcodec_get_context_defaults3(s, NULL); +} +#endif + +int avcodec_get_context_defaults3(AVCodecContext *s, AVCodec *codec){ memset(s, 0, sizeof(AVCodecContext)); - s->av_class= &av_codec_context_class; + s->av_class = &av_codec_context_class; - s->codec_type = codec_type; + s->codec_type = codec ? codec->type : AVMEDIA_TYPE_UNKNOWN; av_opt_set_defaults(s); - s->time_base= (AVRational){0,1}; - s->get_buffer= avcodec_default_get_buffer; - s->release_buffer= avcodec_default_release_buffer; - s->get_format= avcodec_default_get_format; - s->execute= avcodec_default_execute; - s->execute2= avcodec_default_execute2; - s->sample_aspect_ratio= (AVRational){0,1}; - s->pix_fmt= PIX_FMT_NONE; - s->sample_fmt= AV_SAMPLE_FMT_NONE; - - s->reget_buffer= avcodec_default_reget_buffer; - s->reordered_opaque= AV_NOPTS_VALUE; -} - -int avcodec_get_context_defaults3(AVCodecContext *s, AVCodec *codec){ - avcodec_get_context_defaults2(s, codec ? codec->type : AVMEDIA_TYPE_UNKNOWN); + s->time_base = (AVRational){0,1}; + s->get_buffer = avcodec_default_get_buffer; + s->release_buffer = avcodec_default_release_buffer; + s->get_format = avcodec_default_get_format; + s->execute = avcodec_default_execute; + s->execute2 = avcodec_default_execute2; + s->sample_aspect_ratio = (AVRational){0,1}; + s->pix_fmt = PIX_FMT_NONE; + s->sample_fmt = AV_SAMPLE_FMT_NONE; + + s->reget_buffer = avcodec_default_reget_buffer; + s->reordered_opaque = AV_NOPTS_VALUE; if(codec && codec->priv_data_size){ if(!s->priv_data){ s->priv_data= av_mallocz(codec->priv_data_size); @@ -602,13 +604,11 @@ AVCodecContext *avcodec_alloc_context2(enum AVMediaType codec_type){ return avctx; } -#endif void avcodec_get_context_defaults(AVCodecContext *s){ avcodec_get_context_defaults2(s, AVMEDIA_TYPE_UNKNOWN); } -#if FF_API_ALLOC_CONTEXT AVCodecContext *avcodec_alloc_context(void){ return avcodec_alloc_context2(AVMEDIA_TYPE_UNKNOWN); } |