generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '5b9c3b4505206143d85398c1410949319fa1180f'

Browse Source 
* commit '5b9c3b4505206143d85398c1410949319fa1180f':
  Replace all instances of avcodec_alloc_frame() with av_frame_alloc().

Conflicts:
	doc/examples/decoding_encoding.c
	doc/examples/muxing.c
	ffmpeg.c
	libavcodec/alacenc.c
	libavcodec/libopenjpegenc.c
	libavcodec/libvpxenc.c
	libavcodec/pcm.c
	libavcodec/xbmenc.c
	libavcodec/xwdenc.c
	libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-11-16 23:48:16 +01:00
parent 571a99de18 5b9c3b4505
commit 0ee905e243
27 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/utils.c
View File

@@ -2448,7 +2448,7 @@ static int try_decode_frame(AVFormatContext *s, AVStream *st, AVPacket *avpkt, A
{
const AVCodec *codec;
int got_picture = 1, ret = 0;
AVFrame *frame = avcodec_alloc_frame();
AVFrame *frame = av_frame_alloc();
AVSubtitle subtitle;
AVPacket pkt = *avpkt;