* commit '9cfa68c560bdec82d2d5ec079f9c5b0f9ca37af0': mpegts: add support for Opus Conflicts: libavcodec/opus_parser.c libavformat/mpegts.c See: 74141f693d Merged-by: Michael Niedermayer <michaelni@gmx.at>
74141f693d