• Michael Niedermayer's avatar
    Merge commit '5ff998a2' · 7d26be63
    Michael Niedermayer authored
    * commit '5ff998a2':
      flacenc: use uint64_t for bit counts
      flacenc: remove wasted trailing 0 bits
      lavu: add av_ctz() for trailing zero bit count
      flacenc: use a separate buffer for byte-swapping for MD5 checksum on big-endian
      fate: aac: Place LATM tests and general AAC tests in different groups
      build: The A64 muxer depends on rawenc.o for ff_raw_write_packet()
    
    Conflicts:
    	doc/APIchanges
    	libavutil/version.h
    	tests/fate/aac.mak
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    7d26be63
version.h 3.5 KB