Merge commit '9cfa68c560bdec82d2d5ec079f9c5b0f9ca37af0'

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

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

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

libavcodec/opus_parser.c

@@ -26,9 +26,9 @@
  */
 
 #include "avcodec.h"
+#include "bytestream.h"
 #include "opus.h"
 #include "parser.h"
-#include "bytestream.h"
 
 typedef struct OpusParseContext {
     OpusContext ctx;