• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · dbb38bc3
    Michael Niedermayer authored
    * qatar/master:
      swscale: Fix stack alignment for SSE
      avcodec: move some AVCodecContext fields to an internal struct.
      avcodec: use av_opt_set() instead of deprecated av_set_string3()
      avcodec: fix some const warnings
      avcodec: remove pointless AVOption, internal_buffer_count
      imgutils: Fix illegal read.
    
    Conflicts:
    	doc/APIchanges
    	libavcodec/avcodec.h
    	libavcodec/version.h
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    dbb38bc3
mimic.c 15.3 KB