eden-emu/FFmpeg
20
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge commit 'd7b3ee9a3a'

Browse source 
* commit 'd7b3ee9a3a':
  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
Download patch file Download diff file Expand all files Collapse all files

2
libavcodec/utils.c
View file

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