virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
Code Issues Releases Activity

lavc: update doxy to use nondeprecated API.

Browse Source
This commit is contained in:
Anton Khirnov 2011-11-18 11:16:23 +01:00
parent f32dfad9dc
commit 488eec1044
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libavcodec/avcodec.h
View File

@ -1199,7 +1199,7 @@ struct AVCodecInternal;
typedef struct AVCodecContext { typedef struct AVCodecContext {
/** /**
* information on struct for av_log * information on struct for av_log
* - set by avcodec_alloc_context * - set by avcodec_alloc_context3
*/ */
const AVClass *av_class; const AVClass *av_class;
/** /**
@ -2897,8 +2897,8 @@ typedef struct AVCodecContext {
* For SUBTITLE_ASS subtitle type, it should contain the whole ASS * For SUBTITLE_ASS subtitle type, it should contain the whole ASS
* [Script Info] and [V4+ Styles] section, plus the [Events] line and * [Script Info] and [V4+ Styles] section, plus the [Events] line and
* the Format line following. It shouldn't include any Dialogue line. * the Format line following. It shouldn't include any Dialogue line.
* - encoding: Set/allocated/freed by user (before avcodec_open()) * - encoding: Set/allocated/freed by user (before avcodec_open2())
* - decoding: Set/allocated/freed by libavcodec (by avcodec_open()) * - decoding: Set/allocated/freed by libavcodec (by avcodec_open2())
*/ */
uint8_t *subtitle_header; uint8_t *subtitle_header;
int subtitle_header_size; int subtitle_header_size;
@ -3725,7 +3725,7 @@ AVCodecContext *avcodec_alloc_context2(enum AVMediaType);
* resulting struct can be deallocated by simply calling av_free(). * resulting struct can be deallocated by simply calling av_free().
* *
* @param codec if non-NULL, allocate private data and initialize defaults * @param codec if non-NULL, allocate private data and initialize defaults
* for the given codec. It is illegal to then call avcodec_open() * for the given codec. It is illegal to then call avcodec_open2()
* with a different codec. * with a different codec.
* *
* @return An AVCodecContext filled with default values or NULL on failure. * @return An AVCodecContext filled with default values or NULL on failure.
@ -3736,7 +3736,7 @@ AVCodecContext *avcodec_alloc_context3(AVCodec *codec);
/** /**
* Copy the settings of the source AVCodecContext into the destination * Copy the settings of the source AVCodecContext into the destination
* AVCodecContext. The resulting destination codec context will be * AVCodecContext. The resulting destination codec context will be
* unopened, i.e. you are required to call avcodec_open() before you * unopened, i.e. you are required to call avcodec_open2() before you
* can use this AVCodecContext to decode/encode video/audio data. * can use this AVCodecContext to decode/encode video/audio data.
* *
* @param dest target codec context, should be initialized with * @param dest target codec context, should be initialized with
@ -3800,7 +3800,7 @@ enum PixelFormat avcodec_default_get_format(struct AVCodecContext *s, const enum
#if FF_API_THREAD_INIT #if FF_API_THREAD_INIT
/** /**
* @deprecated Set s->thread_count before calling avcodec_open() instead of calling this. * @deprecated Set s->thread_count before calling avcodec_open2() instead of calling this.
*/ */
attribute_deprecated attribute_deprecated
int avcodec_thread_init(AVCodecContext *s, int thread_count); int avcodec_thread_init(AVCodecContext *s, int thread_count);
@ -3846,7 +3846,7 @@ int avcodec_open(AVCodecContext *avctx, AVCodec *codec);
/** /**
* Initialize the AVCodecContext to use the given AVCodec. Prior to using this * Initialize the AVCodecContext to use the given AVCodec. Prior to using this
* function the context has to be allocated with avcodec_alloc_context(). * function the context has to be allocated with avcodec_alloc_context3().
* *
* The functions avcodec_find_decoder_by_name(), avcodec_find_encoder_by_name(), * The functions avcodec_find_decoder_by_name(), avcodec_find_encoder_by_name(),
* avcodec_find_decoder() and avcodec_find_encoder() provide an easy way for * avcodec_find_decoder() and avcodec_find_encoder() provide an easy way for
@ -3861,9 +3861,9 @@ int avcodec_open(AVCodecContext *avctx, AVCodec *codec);
* if (!codec) * if (!codec)
* exit(1); * exit(1);
* *
* context = avcodec_alloc_context(); * context = avcodec_alloc_context3(codec);
* *
* if (avcodec_open(context, codec, opts) < 0) * if (avcodec_open2(context, codec, opts) < 0)
* exit(1); * exit(1);
* @endcode * @endcode
* *