diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-16 23:48:16 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-16 23:54:10 +0100 |
| commit | 0ee905e243078cd4dfb3afa32777129aeee3bddb (patch) | |
| tree | 78bafb0b5626836d18d158139b71d0e6b73780a2 /libavcodec/libutvideoenc.cpp | |
| parent | 571a99de186eac69ed0d6b0eaaaa983cae30765a (diff) | |
| parent | 5b9c3b4505206143d85398c1410949319fa1180f (diff) | |
| download | ffmpeg-0ee905e243078cd4dfb3afa32777129aeee3bddb.tar.gz | |
Merge commit '5b9c3b4505206143d85398c1410949319fa1180f'
* 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>
Diffstat (limited to 'libavcodec/libutvideoenc.cpp')
| -rw-r--r-- | libavcodec/libutvideoenc.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/libutvideoenc.cpp b/libavcodec/libutvideoenc.cpp index 44cd42f02b..ad70669a6b 100644 --- a/libavcodec/libutvideoenc.cpp +++ b/libavcodec/libutvideoenc.cpp @@ -74,7 +74,7 @@ static av_cold int utvideo_encode_init(AVCodecContext *avctx) flags = ((avctx->prediction_method + 1) << 8) | (avctx->thread_count - 1); avctx->priv_data = utv; - avctx->coded_frame = avcodec_alloc_frame(); + avctx->coded_frame = av_frame_alloc(); /* Alloc extradata buffer */ info = (UtVideoExtra *)av_malloc(sizeof(*info)); |