• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · b96dc093
    Michael Niedermayer authored
    * qatar/master:
      wmalosslessdec: increase channel_coeffs/residues size
      wmalosslessdec: increase WMALL_BLOCK_MAX_BITS to 14.
      lagarith: check count before writing zeros.
      wmaprodec: check num_vec_coeffs for validity
      avidec: use actually read size instead of requested size
      avidec: return 0, not packet size from read_packet().
    
    Conflicts:
    	libavcodec/lagarith.c
    	libavcodec/wmalosslessdec.c
    	libavcodec/wmaprodec.c
    	libavformat/avidec.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    b96dc093
lagarith.c 21.5 KB