generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit 'd7b3ee9a3a03ab88d61a5895fbdbc6689f4dd671'

Browse Source 
* commit 'd7b3ee9a3a03ab88d61a5895fbdbc6689f4dd671':
  lavc: deprecate avcodec_get_frame_defaults().

Conflicts:
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-12-12 00:32:15 +01:00
parent e3578fd525 d7b3ee9a3a
commit 44967ab60a
4 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/avcodec.h
View File

@@ -3382,16 +3382,17 @@ int avcodec_copy_context(AVCodecContext *dest, const AVCodecContext *src);
*/
attribute_deprecated
AVFrame *avcodec_alloc_frame(void);
#endif
/**
* Set the fields of the given AVFrame to default values.
*
* @param frame The AVFrame of which the fields should be set to default values.
*
* @deprecated use av_frame_unref()
*/
attribute_deprecated
void avcodec_get_frame_defaults(AVFrame *frame);
#if FF_API_AVFRAME_LAVC
/**
* Free the frame and any dynamically allocated objects in it,
* e.g. extended_data.