Merge commit '7e52080cb18332cb1da9fe133498750b6b4b0fb3'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 27 Sep 2013 10:59:53 +0000 (12:59 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 27 Sep 2013 11:05:05 +0000 (13:05 +0200)
commitb654aa6beb41366f8771525b4f2d864e992d48c1
tree4ced9ec120908e390d885b9b0ec2e947ef240fd9
parente82071e7279ab8d8ec138753822222a6cff26f35
parent7e52080cb18332cb1da9fe133498750b6b4b0fb3
Merge commit '7e52080cb18332cb1da9fe133498750b6b4b0fb3'

* commit '7e52080cb18332cb1da9fe133498750b6b4b0fb3':
  pcm: support 24-bit/32-bit little-endian planar

Conflicts:
doc/general.texi
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/avcodec.h
libavcodec/pcm.c
libavcodec/version.h
libavformat/nut.c

See: 467dfd5dfae7cc435a2b2e7cf012a0de2fea5848
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/avcodec.h
libavcodec/utils.c
libavcodec/version.h