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-19 02:49:36 +01:00
2014-12-06 17:12:49 +01:00
2014-12-20 00:17:21 +01:00
2014-12-18 00:10:35 +01:00
2014-12-20 01:48:26 +01:00
2014-12-15 15:43:42 +01:00
2014-12-01 00:31:06 +01:00
2014-12-18 00:10:35 +01:00
2014-11-19 20:23:04 +01:00
2014-11-25 18:19:00 +01:00
2014-12-14 17:39:53 +01:00
2014-11-13 15:31:19 +01:00
2014-12-15 20:00:35 +01:00
2014-12-09 19:58:56 +01:00
2014-12-17 12:05:00 +01:00
2014-11-20 00:21:09 +01:00
2014-12-15 00:38:05 +01:00
2014-12-04 20:24:00 +01:00
2014-12-18 00:10:35 +01:00
2014-11-27 23:19:20 +01:00
2014-11-27 23:19:41 +01:00
2014-11-06 13:42:41 +01:00
2014-12-15 15:49:00 +01:00
2014-12-16 15:37:04 +01:00
2014-11-23 13:22:27 +01:00
2014-12-16 15:37:04 +01:00
2014-12-16 15:37:04 +01:00
2014-12-20 16:53:37 +01:00
2014-11-15 11:30:42 +01:00
2014-12-20 16:53:14 +01:00
2014-11-27 11:52:33 +01:00
2014-12-16 23:37:24 +01:00
2014-11-25 15:20:54 +01:00
2014-11-18 00:38:26 +01:00
2014-11-25 23:49:58 +01:00
2014-12-19 02:49:36 +01:00
2014-12-18 00:10:35 +01:00
2014-12-19 04:57:25 +01:00
2014-12-18 00:10:35 +01:00
2014-11-06 14:48:41 +01:00
2014-12-20 16:54:25 +01:00
2014-12-19 12:31:52 +01:00
2014-12-19 02:58:16 +01:00
2014-12-19 02:58:16 +01:00
2014-12-14 20:08:13 +01:00
2014-12-02 15:28:22 +00:00
2014-12-06 22:38:38 +01:00
2014-12-19 15:18:31 +01:00
2014-12-20 19:15:11 +01:00
2014-12-20 00:33:40 +01:00
2014-12-19 23:12:58 +02:00
2014-11-30 23:14:06 +01:00
2014-11-30 23:14:06 +01:00
2014-12-15 01:37:12 +01:00
2014-11-23 06:51:18 +01:00
2014-11-06 09:05:37 +01:00
2014-12-14 02:12:49 +01:00
2014-12-18 23:27:07 +01:00
2014-12-18 23:27:07 +01:00
2014-12-14 14:30:45 +01:00
2014-11-06 13:42:41 +01:00
2014-11-06 13:02:08 +01:00
2014-12-19 04:36:45 +01:00
2014-11-07 23:09:30 +01:00
2014-11-18 02:46:07 +01:00
2014-12-20 00:49:47 +01:00
2014-12-02 11:40:01 +01:00
2014-12-07 13:15:03 +01:00
2014-12-02 15:28:22 +00:00
2014-12-06 00:48:47 +01:00
2014-12-08 13:29:18 +00:00
2014-12-18 00:10:35 +01:00
2014-12-18 00:10:35 +01:00
2014-11-06 14:53:21 +01:00
2014-12-06 00:48:47 +01:00
2014-12-06 00:49:23 +01:00
2014-12-20 00:17:43 +01:00
2014-11-28 12:14:26 +01:00
2014-11-28 22:01:45 +01:00
2014-12-19 02:34:17 +01:00
2014-12-19 02:34:17 +01:00
2014-12-18 20:40:39 +01:00
2014-12-15 15:48:35 +01:00
2014-12-18 23:11:37 +02:00
2014-12-19 13:25:51 +01:00
2014-12-20 00:42:07 +01:00
2014-12-19 02:34:17 +01:00
2014-12-18 23:11:37 +02:00
2014-12-10 01:24:12 +01:00
2014-12-19 05:04:24 +01:00
2014-12-19 02:34:17 +01:00
2014-11-16 03:02:29 +01:00
2014-11-27 11:52:33 +01:00
2014-11-24 13:10:16 +01:00
2014-12-18 19:59:03 +01:00
2014-11-12 13:52:56 +01:00
2014-11-27 19:53:09 +01:00
2014-12-19 19:32:40 +01:00
2014-12-19 04:36:45 +01:00
2014-12-19 23:57:39 +01:00
2014-12-09 16:15:40 +01:00
2014-11-12 00:21:37 +01:00
2014-11-07 04:15:01 +01:00
2014-12-20 01:51:16 +01:00
2014-12-18 00:10:35 +01:00
2014-12-15 16:01:05 +01:00
2014-12-18 00:10:35 +01:00
2014-12-10 14:46:39 +01:00
2014-11-06 14:48:50 +01:00