Michael Niedermayer b654aa6beb 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: 467dfd5dfa
Merged-by: Michael Niedermayer <michaelni@gmx.at>

2013-09-27 13:05:05 +02:00

169 KiB

Raw Blame History

View Raw