Browse Source

lavc: deprecate avcodec_alloc_frame().

tags/n2.2-rc1
Anton Khirnov 12 years ago
parent
commit
b9fb59d2ab
2 changed files with 6 additions and 5 deletions
  1. +4
    -5
      libavcodec/avcodec.h
  2. +2
    -0
      libavcodec/utils.c

+ 4
- 5
libavcodec/avcodec.h View File

@@ -3096,14 +3096,13 @@ const AVClass *avcodec_get_class(void);
*/ */
int avcodec_copy_context(AVCodecContext *dest, const AVCodecContext *src); int avcodec_copy_context(AVCodecContext *dest, const AVCodecContext *src);


#if FF_API_AVFRAME_LAVC
/** /**
* Allocate an AVFrame and set its fields to default values. The resulting
* struct must be freed using avcodec_free_frame().
*
* @return An AVFrame filled with default values or NULL on failure.
* @see avcodec_get_frame_defaults
* @deprecated use av_frame_alloc()
*/ */
attribute_deprecated
AVFrame *avcodec_alloc_frame(void); AVFrame *avcodec_alloc_frame(void);
#endif


/** /**
* Set the fields of the given AVFrame to default values. * Set the fields of the given AVFrame to default values.


+ 2
- 0
libavcodec/utils.c View File

@@ -815,6 +815,7 @@ void avcodec_get_frame_defaults(AVFrame *frame)
frame->extended_data = frame->data; frame->extended_data = frame->data;
} }


#if FF_API_AVFRAME_LAVC
AVFrame *avcodec_alloc_frame(void) AVFrame *avcodec_alloc_frame(void)
{ {
AVFrame *frame = av_mallocz(sizeof(AVFrame)); AVFrame *frame = av_mallocz(sizeof(AVFrame));
@@ -826,6 +827,7 @@ AVFrame *avcodec_alloc_frame(void)


return frame; return frame;
} }
#endif


void avcodec_free_frame(AVFrame **frame) void avcodec_free_frame(AVFrame **frame)
{ {


Loading…
Cancel
Save