Merge commit '5ff998a233d759d0de83ea6f95c383d03d25d88e'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 5 Nov 2012 21:51:20 +0000 (22:51 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 5 Nov 2012 21:51:20 +0000 (22:51 +0100)
commit7d26be63c25e715f008e8923654bdf318419dd39
treec3d598d06854085a7e9f9474dee81e543f069cdb
parente859339e7af52210c6fe84a8e6412f0c30d1c4da
parent5ff998a233d759d0de83ea6f95c383d03d25d88e
Merge commit '5ff998a233d759d0de83ea6f95c383d03d25d88e'

* commit '5ff998a233d759d0de83ea6f95c383d03d25d88e':
  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: Michael Niedermayer <michaelni@gmx.at>
doc/APIchanges
libavcodec/flacenc.c
libavformat/Makefile
libavutil/Makefile
libavutil/intmath.c
libavutil/intmath.h
libavutil/version.h
tests/fate/aac.mak