Merge commit '5b9c3b4505'
* commit '5b9c3b4505':
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:
commit
0ee905e243
27 changed files with 33 additions and 33 deletions
|
|
@ -96,7 +96,7 @@ static av_cold int utvideo_decode_init(AVCodecContext *avctx)
|
|||
}
|
||||
|
||||
/* Allocate the output frame */
|
||||
avctx->coded_frame = avcodec_alloc_frame();
|
||||
avctx->coded_frame = av_frame_alloc();
|
||||
|
||||
/* Ut Video only supports 8-bit */
|
||||
avctx->bits_per_raw_sample = 8;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue