• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · e4c00aca
    Michael Niedermayer authored
    * qatar/master: (38 commits)
      alac: cosmetics: general pretty-printing and comment clean up
      alac: calculate buffer size outside the loop in allocate_buffers()
      alac: change some data types to plain int
      alac: cosmetics: rename some variables and function names
      alac: multi-channel decoding support
      alac: split element parsing into a separate function
      alac: support a read sample size of up to 32
      alac: output in planar sample format
      alac: add 32-bit decoding support
      alac: simplify channel interleaving
      alac: use AVPacket fields directly in alac_decode_frame()
      alac: fix check for valid max_samples_per_frame
      alac: use get_sbits() to read LPC coefficients instead of casting
      alac: move the current samples per frame to the ALACContext
      alac: avoid using a double-negative when checking if the frame is compressed
      alac: factor out output_size check in predictor_decompress_fir_adapt()
      alac: factor out loading of next decoded sample in LPC prediction
      alac: use index into buffer_out instead of incrementing the pointer
      alac: simplify lpc coefficient adaptation
      alac: reduce the number of local variables needed in lpc prediction
      ...
    
    Conflicts:
    	libavcodec/alac.c
    	libavformat/cafdec.c
    	libavformat/mov.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    e4c00aca
isom.c 27.8 KB