• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 2f7bd3b5
    Michael Niedermayer authored
    * qatar/master:
      apedec: check bits <= 32.
      cavs: Remove unused code.
      oggenc: fix condition when not to flush due to keyframe granule.
      oggenc: add pagesize option to set preferred page size
      libspeexdec: set frame size in libspeex_decode_init()
      smacker audio: sign-extend the initial 16-bit predicted value
    
    Conflicts:
    	libavcodec/apedec.c
    	libavcodec/libspeexdec.c
    	libavformat/oggenc.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    2f7bd3b5
apedec.c 30.7 KB