Michael Niedermayer 8e2fcd1cb4 Merge commit '5a79bf0284a37855636390e620d189a964214c9e' ...

* commit '5a79bf0284a37855636390e620d189a964214c9e':
  PCM signed 16-bit big-endian planar decoder

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

See: 9ba41ae63e
Merged-by: Michael Niedermayer <michaelni@gmx.at>

2015-06-24 20:36:26 +02:00

178 KiB

Raw Blame History

View Raw