Merge commit '9cfa68c560bdec82d2d5ec079f9c5b0f9ca37af0'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 20 Dec 2014 18:08:39 +0000 (19:08 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 20 Dec 2014 18:15:11 +0000 (19:15 +0100)
commit5318cf521f66cd58642c07e8036f6232d4c60ed2
tree5a2ca7a5beae44353f2d7621f0a0073cf9c33785
parent988ca9bd53c0bd240383ccf7b0ca0eb7224a8ff5
parent9cfa68c560bdec82d2d5ec079f9c5b0f9ca37af0
Merge commit '9cfa68c560bdec82d2d5ec079f9c5b0f9ca37af0'

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

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

See: 74141f693ded2fbf75af56fff309d2db35183635
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/opus_parser.c
libavformat/mpegts.c