diff options
| author | Michael Niedermayer <[email protected]> | 2013-11-17 00:00:55 +0100 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2013-11-17 00:01:23 +0100 |
| commit | 29c83d23e8edf47ce423f85d4a2f2081a674a940 (patch) | |
| tree | 90252f95122f3e91f9f6c0378f0c9835241881b5 /libavcodec/avcodec.h | |
| parent | 0ee905e243078cd4dfb3afa32777129aeee3bddb (diff) | |
| parent | b9fb59d2ab05fdfe89d3fb0d7ecbbd91e560f57d (diff) | |
Merge commit 'b9fb59d2ab05fdfe89d3fb0d7ecbbd91e560f57d'
* commit 'b9fb59d2ab05fdfe89d3fb0d7ecbbd91e560f57d':
lavc: deprecate avcodec_alloc_frame().
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavcodec/avcodec.h')
| -rw-r--r-- | libavcodec/avcodec.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index f934ee4cc7..90abdb2e6f 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -3363,14 +3363,13 @@ const AVClass *avcodec_get_subtitle_rect_class(void); */ 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); +#endif /** * Set the fields of the given AVFrame to default values. |