Skip to content
Snippets Groups Projects
Commit 0ee905e2 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

Merge commit '5b9c3b45'


* commit '5b9c3b45':
  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: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 571a99de 5b9c3b45
No related branches found
No related tags found
No related merge requests found
Showing
with 25 additions and 25 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment