• Michael Niedermayer's avatar
    Merge commit '5b9c3b45' · 0ee905e2
    Michael Niedermayer authored
    * 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: 's avatarMichael Niedermayer <michaelni@gmx.at>
    0ee905e2
ffv1.c 6.5 KB