1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-08 22:39:44 +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-08-24 11:05:42 +00: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-10-20 10:38:38 +01:00
2014-12-09 19:58:56 +01:00
2014-08-30 15:50:22 +00:00
2014-12-18 00:10:35 +01:00
2014-08-24 11:05:42 +00:00
2014-06-18 14:55:28 +02:00
2014-06-03 10:58:19 -08:00
2014-10-20 10:38:37 +01:00
2014-08-24 11:05:42 +00:00
2014-08-24 11:05:42 +00:00
2014-12-16 23:37:24 +01:00
2014-07-03 15:46:26 +02:00
2014-07-13 19:18:31 +02:00
2014-07-13 19:18:31 +02:00
2014-08-15 22:47:45 +02:00
2014-09-30 20:21:14 +02:00
2014-12-18 00:10:35 +01:00
2014-12-18 00:10:35 +01:00
2014-05-17 20:13:33 +02: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-08-24 11:05:42 +00: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-08-15 22:47:45 +02:00
2014-12-18 23:11:37 +02:00
2014-12-18 23:11:37 +02:00
2014-10-21 03:52:27 +02:00
2014-10-24 09:53:45 +03:00
2014-07-19 19:44:56 +02:00
2014-08-24 11:05:42 +00:00
2014-08-24 11:05:42 +00:00
2014-09-30 20:21:14 +02:00
2014-10-22 23:12:38 +02:00
2014-08-03 03:18:52 +02:00
2014-08-16 14:31:41 +02:00
2014-08-24 11:05:42 +00:00
2014-08-24 11:05:42 +00:00
2014-12-18 00:10:35 +01:00
2014-12-18 00:10:35 +01:00