highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit 'b9fb59d2ab05fdfe89d3fb0d7ecbbd91e560f57d'

Browse Source 
* commit 'b9fb59d2ab05fdfe89d3fb0d7ecbbd91e560f57d':
  lavc: deprecate avcodec_alloc_frame().

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-11-17 00:00:55 +01:00
commit 29c83d23e8
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavcodec/avcodec.h
View File

@ -3363,14 +3363,13 @@ const AVClass *avcodec_get_subtitle_rect_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 * @deprecated use av_frame_alloc()
* struct must be freed using avcodec_free_frame().
*
* @return An AVFrame filled with default values or NULL on failure.
* @see avcodec_get_frame_defaults
*/ */
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
libavcodec/utils.c
View File

@ -1070,6 +1070,7 @@ void avcodec_get_frame_defaults(AVFrame *frame)
av_frame_set_colorspace(frame, AVCOL_SPC_UNSPECIFIED); av_frame_set_colorspace(frame, AVCOL_SPC_UNSPECIFIED);
} }
#if FF_API_AVFRAME_LAVC
AVFrame *avcodec_alloc_frame(void) AVFrame *avcodec_alloc_frame(void)
{ {
AVFrame *frame = av_malloc(sizeof(AVFrame)); AVFrame *frame = av_malloc(sizeof(AVFrame));
@ -1082,6 +1083,7 @@ AVFrame *avcodec_alloc_frame(void)
return frame; return frame;
} }
#endif
void avcodec_free_frame(AVFrame **frame) void avcodec_free_frame(AVFrame **frame)
{ {