• Michael Niedermayer's avatar
    Merge commit '7751e469' · 46a35959
    Michael Niedermayer authored
    * commit '7751e469':
      ogg: check that the expected number of headers had been parsed
      libx264: change default to closed gop to match x264cli
      Use avcodec_free_frame() to free AVFrames.
      lavf: use a malloced AVFrame in try_decode_frame().
      lavc: add avcodec_free_frame().
      lavc: ensure extended_data is set properly on decoding
      lavc: initialize AVFrame.extended_data in avcodec_get_frame_defaults()
      lavc: use av_mallocz to allocate AVFrames.
      lavc: rename the argument of avcodec_alloc_frame/get_frame_defaults
    
    Conflicts:
    	doc/APIchanges
    	doc/examples/decoding_encoding.c
    	libavcodec/utils.c
    	libavcodec/version.h
    	libavfilter/src_movie.c
    	libavformat/oggdec.c
    	libavformat/oggdec.h
    	libavformat/oggparsetheora.c
    	libavformat/utils.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    46a35959
version.h 3.25 KB