* commit '9cfa68c5':
  mpegts: add support for Opus

Conflicts:
	libavcodec/opus_parser.c
	libavformat/mpegts.c

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