* commit '04a1be8e':
  libavformat: add T.140 RTP depacketization (RFC 4103)

Conflicts:
	libavformat/rtpdec.c
	libavformat/version.h

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