1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-19 05:49:09 +02:00
FFmpeg/libavformat
Michael Niedermayer 5318cf521f 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>
2014-12-20 19:15:11 +01:00
..
2014-12-18 00:10:35 +01:00
2014-12-18 00:10:35 +01:00
2014-12-01 00:31:06 +01:00
2014-12-18 00:10:35 +01:00
2014-12-09 19:58:56 +01:00
2014-12-18 00:10:35 +01:00
2014-12-16 23:37:24 +01:00
2014-12-18 00:10:35 +01:00
2014-12-18 00:10:35 +01:00
2014-11-06 09:05:37 +01:00
2014-12-18 23:27:07 +01:00
2014-12-18 23:27:07 +01:00
2014-12-02 11:40:01 +01:00
2014-12-18 00:10:35 +01:00
2014-12-18 00:10:35 +01:00
2014-12-20 00:17:43 +01:00
2014-12-18 23:11:37 +02:00
2014-12-18 23:11:37 +02:00
2014-12-18 00:10:35 +01:00
2014-12-18 00:10:35 +01:00