Merge remote-tracking branch 'qatar/master'

* qatar/master:
  fmtconvert: Explicitly use int32_t instead of int

Conflicts:
	libavcodec/ac3dec.c
	libavcodec/fmtconvert.c
	libavcodec/fmtconvert.h

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

diff --cc libavcodec/ac3dec.c
Simple merge

diff --cc libavcodec/fmtconvert.c
Simple merge

diff --cc libavcodec/fmtconvert.h
Simple merge