• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 70d9fb69
    Michael Niedermayer authored
    * qatar/master:
      sunrast: Check for out of bounds reads
      lavc: rename AV_ER_* options to AV_EF_* and rename AGGRESSIVE to BUFFER
      lavc: replace API-bump-triggered AVCodecContext field change with shorter, non-conflicting name
      Add libvpx presets.
      doc/avtools: add forgotten part to stream specifiers description
      swscale: prevent overflow during initialization
      g722: Add a fate test for the encoder
      fate: Add a target for creating a 16000 Hz mono synthetic audio file
      macosx: use the default surface on newer sdl
    
    Conflicts:
    	ffplay.c
    	libavcodec/avcodec.h
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    70d9fb69
avcodec.h 143 KB