• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · cd1c12b5
    Michael Niedermayer authored
    * qatar/master:
      FATE: update reference for seek-alac_mp4
      sunrast: Return AVERROR values instead of -1.
      sunrast: Add support for gray8 decoding.
      swscale: enforce a minimum filtersize.
      alacenc: use AVCodec.encode2()
      alacenc: cosmetics: indentation
      alacenc: consolidate bitstream writing into a single function.
      alacenc: only encode frame size in header for a final smaller frame
      alacenc: store current frame size in AlacEncodeContext.
      alacenc: return AVERROR codes in alac_encode_frame()
      alacenc: calculate a new max frame size for the final small frame
      alacenc: pretty-printing and other cosmetics
      alacenc: fix error handling and potential memleaks in alac_encode_init()
      alacenc: do not set coded_frame->key_frame
      alacenc: do not set bits_per_coded_sample
      alacenc: remove unneeded frame_size check in alac_encode_frame()
      tta: error out if samplerate is zero.
      ttadec: fix invalid free when an error occurs while decoding 24-bit tta
      wavpack: add needed braces for 2 statements inside an if block
    
    Conflicts:
    	tests/ref/acodec/alac
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    cd1c12b5
wavpack.c 40.9 KB