diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-12 00:32:15 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-12 00:32:15 +0100 |
| commit | 44967ab60a9baf62f86bc727b51ff0acb587e676 (patch) | |
| tree | 1385f738c56d90099a20088c4003ed356277fc0b /libavcodec/avcodec.h | |
| parent | e3578fd525e94bfec16de1dfd0e5a49f18a0e0fd (diff) | |
| parent | d7b3ee9a3a03ab88d61a5895fbdbc6689f4dd671 (diff) | |
| download | ffmpeg-44967ab60a9baf62f86bc727b51ff0acb587e676.tar.gz | |
Merge commit 'd7b3ee9a3a03ab88d61a5895fbdbc6689f4dd671'
* commit 'd7b3ee9a3a03ab88d61a5895fbdbc6689f4dd671':
lavc: deprecate avcodec_get_frame_defaults().
Conflicts:
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/avcodec.h')
| -rw-r--r-- | libavcodec/avcodec.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index a5ae852aea..fbf31ef4f6 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -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. |