har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 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
commit 44967ab60a
4 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
doc/APIchanges
View File

@ -21,6 +21,11 @@ API changes, most recent first:
Moves version.h to libavutil/ffversion.h. Moves version.h to libavutil/ffversion.h.
Install ffversion.h and make it public. Install ffversion.h and make it public.
2013-12-xx - xxxxxxx - lavc 55.28.1 - avcodec.h
av_frame_alloc(), av_frame_unref() and av_frame_free() now can and should be
used instead of avcodec_alloc_frame(), avcodec_get_frame_defaults() and
avcodec_free_frame() respectively. The latter three functions are deprecated.
2013-11-xx - xxxxxxx- - lavu 52.20.0 - frame.h 2013-11-xx - xxxxxxx- - lavu 52.20.0 - frame.h
Add AV_FRAME_DATA_STEREO3D value to the AVFrameSideDataType enum and Add AV_FRAME_DATA_STEREO3D value to the AVFrameSideDataType enum and
stereo3d.h API, that identify codec-independent stereo3d information. stereo3d.h API, that identify codec-independent stereo3d information.

5
libavcodec/avcodec.h
View File

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

2
libavcodec/utils.c
View File

@ -1049,6 +1049,7 @@ enum AVPixelFormat avcodec_default_get_format(struct AVCodecContext *s, const en
return fmt[0]; return fmt[0];
} }
#if FF_API_AVFRAME_LAVC
void avcodec_get_frame_defaults(AVFrame *frame) void avcodec_get_frame_defaults(AVFrame *frame)
{ {
#if LIBAVCODEC_VERSION_MAJOR >= 55 #if LIBAVCODEC_VERSION_MAJOR >= 55
@ -1074,7 +1075,6 @@ void avcodec_get_frame_defaults(AVFrame *frame)
av_frame_set_colorspace(frame, AVCOL_SPC_UNSPECIFIED); av_frame_set_colorspace(frame, AVCOL_SPC_UNSPECIFIED);
} }
#if FF_API_AVFRAME_LAVC
AVFrame *avcodec_alloc_frame(void) AVFrame *avcodec_alloc_frame(void)
{ {
AVFrame *frame = av_malloc(sizeof(AVFrame)); AVFrame *frame = av_malloc(sizeof(AVFrame));

2
libavcodec/version.h
View File

@ -30,7 +30,7 @@
#define LIBAVCODEC_VERSION_MAJOR 55 #define LIBAVCODEC_VERSION_MAJOR 55
#define LIBAVCODEC_VERSION_MINOR 45 #define LIBAVCODEC_VERSION_MINOR 45
#define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_MICRO 101
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \ LIBAVCODEC_VERSION_MINOR, \