diff options
author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-05 17:31:45 +0200 |
---|---|---|
committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-05 17:31:45 +0200 |
commit | b9fd813351733b867fb73219e33b1f4845b40dde (patch) | |
tree | 5eabf60865b557c7616892fa6ce7c2676f97cb54 /libavcodec/avcodec.h | |
parent | f1b02e6ca88909f428d4a690c47620575853b647 (diff) | |
parent | 8f12ef9860d0e164e4647fd5d5cebdb3cfb34a79 (diff) | |
download | ffmpeg-b9fd813351733b867fb73219e33b1f4845b40dde.tar.gz |
Merge commit '8f12ef9860d0e164e4647fd5d5cebdb3cfb34a79'
* commit '8f12ef9860d0e164e4647fd5d5cebdb3cfb34a79':
lavu: Drop deprecated duplicated AVFrame/AVCodecContext parameters
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec/avcodec.h')
-rw-r--r-- | libavcodec/avcodec.h | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 6a918e904a..22aeca361f 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -3780,39 +3780,6 @@ const AVClass *avcodec_get_subtitle_rect_class(void); */ int avcodec_copy_context(AVCodecContext *dest, const AVCodecContext *src); -#if FF_API_AVFRAME_LAVC -/** - * @deprecated use av_frame_alloc() - */ -attribute_deprecated -AVFrame *avcodec_alloc_frame(void); - -/** - * 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); - -/** - * Free the frame and any dynamically allocated objects in it, - * e.g. extended_data. - * - * @param frame frame to be freed. The pointer will be set to NULL. - * - * @warning this function does NOT free the data buffers themselves - * (it does not know how, since they might have been allocated with - * a custom get_buffer()). - * - * @deprecated use av_frame_free() - */ -attribute_deprecated -void avcodec_free_frame(AVFrame **frame); -#endif - /** * Initialize the AVCodecContext to use the given AVCodec. Prior to using this * function the context has to be allocated with avcodec_alloc_context3(). |