virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-06-14 22:15:12 +02:00
Code Issues Releases Activity

Merge commit '7751e4693dd10ec98c20fbd9887233b575034272'

Browse Source 
* 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:
Michael Niedermayer
2012-09-25 13:34:06 +02:00
parent 2089f93300 7751e4693d
commit 46a35959d8
21 changed files with 125 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
libavcodec/utils.c
View File

@ -695,31 +695,54 @@ enum PixelFormat avcodec_default_get_format(struct AVCodecContext *s, const enum
return fmt[0];
}
void avcodec_get_frame_defaults(AVFrame *pic)
void avcodec_get_frame_defaults(AVFrame *frame)
{
memset(pic, 0, sizeof(AVFrame));
#if LIBAVCODEC_VERSION_MAJOR >= 55
// extended_data should explicitly be freed when needed, this code is unsafe currently
// also this is not compatible to the <55 ABI/API
if (frame->extended_data != frame->data && 0)
av_freep(&frame->extended_data);
#endif
pic->pts =
pic->pkt_dts =
pic->pkt_pts =
pic->best_effort_timestamp = AV_NOPTS_VALUE;
pic->pkt_duration = 0;
pic->pkt_pos = -1;
pic->key_frame = 1;
pic->sample_aspect_ratio = (AVRational) {0, 1 };
pic->format = -1; /* unknown */
memset(frame, 0, sizeof(AVFrame));
frame->pts =
frame->pkt_dts =
frame->pkt_pts =
frame->best_effort_timestamp = AV_NOPTS_VALUE;
frame->pkt_duration = 0;
frame->pkt_pos = -1;
frame->key_frame = 1;
frame->sample_aspect_ratio = (AVRational) {0, 1 };
frame->format = -1; /* unknown */
frame->extended_data = frame->data;
}
AVFrame *avcodec_alloc_frame(void)
{
AVFrame *pic = av_malloc(sizeof(AVFrame));
AVFrame *frame = av_mallocz(sizeof(AVFrame));
if (pic == NULL)
if (frame == NULL)
return NULL;
avcodec_get_frame_defaults(pic);
avcodec_get_frame_defaults(frame);
return pic;
return frame;
}
void avcodec_free_frame(AVFrame **frame)
{
AVFrame *f;
if (!frame || !*frame)
return;
f = *frame;
if (f->extended_data != f->data)
av_freep(&f->extended_data);
av_freep(frame);
}
#define MAKE_ACCESSORS(str, name, type, field) \
@ -1572,6 +1595,10 @@ int attribute_align_arg avcodec_decode_video2(AVCodecContext *avctx, AVFrame *pi
} else
ret = 0;
/* many decoders assign whole AVFrames, thus overwriting extended_data;
* make sure it's set correctly */
picture->extended_data = picture->data;
return ret;
}
@ -1629,6 +1656,7 @@ int attribute_align_arg avcodec_decode_audio4(AVCodecContext *avctx,
int *got_frame_ptr,
const AVPacket *avpkt)
{
int planar, channels;
int ret = 0;
*got_frame_ptr = 0;
@ -1710,6 +1738,15 @@ int attribute_align_arg avcodec_decode_audio4(AVCodecContext *avctx,
ret = avpkt->size;
}
}
/* many decoders assign whole AVFrames, thus overwriting extended_data;
* make sure it's set correctly; assume decoders that actually use
* extended_data are doing it correctly */
planar = av_sample_fmt_is_planar(frame->format);
channels = av_get_channel_layout_nb_channels(frame->channel_layout);
if (!(planar && channels > AV_NUM_DATA_POINTERS))
frame->extended_data = frame->data;
return ret;
}