Merge commit '7751e4693dd10ec98c20fbd9887233b575034272'
* commit '7751e4693dd10ec98c20fbd9887233b575034272': ogg: check that the expected number of headers had been parsed libx264: change default to closed gop to match x264cli Use avcodec_free_frame() to free AVFrames. lavf: use a malloced AVFrame in try_decode_frame(). lavc: add avcodec_free_frame(). lavc: ensure extended_data is set properly on decoding lavc: initialize AVFrame.extended_data in avcodec_get_frame_defaults() lavc: use av_mallocz to allocate AVFrames. lavc: rename the argument of avcodec_alloc_frame/get_frame_defaults Conflicts: doc/APIchanges doc/examples/decoding_encoding.c libavcodec/utils.c libavcodec/version.h libavfilter/src_movie.c libavformat/oggdec.c libavformat/oggdec.h libavformat/oggparsetheora.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
@@ -3509,7 +3509,7 @@ int avcodec_copy_context(AVCodecContext *dest, const AVCodecContext *src);
|
||||
|
||||
/**
|
||||
* Allocate an AVFrame and set its fields to default values. The resulting
|
||||
* struct can be deallocated by simply calling av_free().
|
||||
* struct must be freed using avcodec_free_frame().
|
||||
*
|
||||
* @return An AVFrame filled with default values or NULL on failure.
|
||||
* @see avcodec_get_frame_defaults
|
||||
@@ -3519,9 +3519,21 @@ AVFrame *avcodec_alloc_frame(void);
|
||||
/**
|
||||
* Set the fields of the given AVFrame to default values.
|
||||
*
|
||||
* @param pic The AVFrame of which the fields should be set to default values.
|
||||
* @param frame The AVFrame of which the fields should be set to default values.
|
||||
*/
|
||||
void avcodec_get_frame_defaults(AVFrame *pic);
|
||||
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()).
|
||||
*/
|
||||
void avcodec_free_frame(AVFrame **frame);
|
||||
|
||||
#if FF_API_AVCODEC_OPEN
|
||||
/**
|
||||
|
Reference in New Issue
Block a user