Michael Niedermayer
441d5a7084
Merge commit 'b0017579b6e8de3d0d13dcfe0a4dd848dc6baa37'
* commit 'b0017579b6e8de3d0d13dcfe0a4dd848dc6baa37':
h264: Add support for Closed Caption export
Conflicts:
libavcodec/h264.c
libavcodec/h264_sei.c
See: 8234f0e3b485811d60c228c40a94a141c46e61ca
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-17 14:13:19 +02:00
..
2015-07-16 15:03:02 +02:00
2015-07-08 01:32:04 +02:00
2015-07-09 14:41:31 +02:00
2015-07-05 16:59:26 +02:00
2015-07-09 14:41:41 +02:00
2015-07-09 14:41:31 +02:00
2015-07-09 14:41:41 +02:00
2015-07-09 14:41:19 +02:00
2015-07-07 22:56:30 +02:00
2015-07-05 16:59:26 +02:00
2015-07-03 13:17:57 +02:00
2015-07-01 02:34:01 +02:00
2015-07-09 14:41:19 +02:00
2015-07-09 14:41:19 +02:00
2015-06-28 16:42:25 +02:00
2015-06-30 21:19:22 +02:00
2015-07-13 15:47:49 +02:00
2015-07-14 18:00:36 +02:00
2015-07-01 18:58:01 +02:00
2015-07-16 12:18:30 +02:00
2015-07-05 23:05:25 +02:00
2015-07-12 21:13:07 +02:00
2015-07-09 14:41:19 +02:00
2015-07-09 14:41:19 +02:00
2015-07-09 14:41:19 +02:00
2015-07-09 14:41:19 +02:00
2015-07-12 13:32:22 -03:00
2015-07-03 03:40:22 +02:00
2015-07-03 03:40:22 +02:00
2015-07-13 09:00:37 +02:00
2015-07-01 16:26:42 +01:00
2015-07-01 03:18:30 +02:00
2015-07-10 18:11:28 +02:00
2015-07-12 15:08:30 +02:00
2015-07-09 00:49:20 +02:00
2015-07-01 15:53:15 +02:00
2015-06-30 03:24:26 +02:00
2015-07-17 14:13:19 +02:00
2015-07-08 17:50:05 +02:00
2015-07-17 14:13:19 +02:00
2015-07-17 14:13:19 +02:00
2015-07-01 20:39:25 +02:00
2015-07-16 20:41:07 +02:00
2015-07-13 17:04:13 +02:00
2015-07-13 17:04:13 +02:00
2015-07-12 22:28:54 +02:00
2015-07-12 22:28:54 +02:00
2015-07-13 01:09:21 +02:00
2015-07-13 22:26:53 +02:00
2015-07-09 11:53:14 +02:00
2015-07-15 21:21:40 +02:00
2015-07-12 23:44:24 +02:00
2015-07-12 22:28:54 +02:00
2015-07-13 16:41:09 +02:00
2015-07-13 01:09:21 +02:00
2015-07-12 22:28:54 +02:00
2015-06-28 14:51:07 +02:00
2015-07-07 14:35:15 +02:00
2015-07-07 14:35:15 +02:00
2015-07-11 00:00:36 +02:00
2015-07-17 00:16:45 +02:00
2015-06-30 22:14:25 +02:00
2015-07-10 23:24:20 +02:00
2015-06-28 15:26:31 +02:00
2015-06-28 03:16:06 +02:00
2015-07-03 18:08:01 +02:00
2015-07-08 23:04:17 -03:00
2015-07-14 18:00:36 +02:00
2015-07-10 04:19:07 +02:00
2015-07-10 02:32:08 +02:00
2015-07-06 19:11:42 +02:00
2015-07-14 18:00:36 +02:00
2015-07-09 14:41:31 +02:00
2015-07-06 18:25:14 +02:00
2015-07-06 18:25:14 +02:00
2015-07-16 12:18:30 +02:00
2015-07-10 13:42:41 +02:00
2015-07-01 15:42:07 +02:00
2015-07-12 10:24:17 -07:00
2015-06-27 09:28:34 -07:00
2015-07-15 21:05:24 +02:00
2015-07-16 12:18:30 +02:00
2015-07-03 03:40:22 +02:00
2015-07-12 21:34:59 +02:00
2015-07-14 00:31:57 +02:00
2015-07-09 01:17:49 +02:00
2015-07-06 18:25:01 +02:00
2015-07-06 18:25:01 +02:00
2015-07-01 20:30:48 +02:00
2015-07-14 23:00:44 +02:00
2015-07-09 01:17:49 +02:00
2015-07-03 21:40:47 +02:00
2015-06-29 12:03:43 +02:00
2015-06-29 12:03:43 +02:00
2015-06-29 22:32:02 +02:00
2015-06-28 14:24:30 +02:00
2015-07-16 12:18:30 +02:00
2015-07-14 02:02:55 +02:00
2015-07-14 02:02:55 +02:00
2015-07-16 21:30:45 +02:00
2015-07-16 21:30:45 +02:00
2015-07-16 21:30:45 +02:00
2015-07-02 19:16:41 +02:00
2015-07-09 16:51:51 +02:00
2015-07-09 11:17:12 +02:00
2015-07-14 02:02:55 +02:00
2015-07-14 02:02:55 +02:00
2015-07-09 01:17:49 +02:00
2015-07-05 20:00:15 +02:00
2015-07-13 16:06:37 +02:00
2015-07-01 02:33:45 +02:00
2015-07-03 16:57:11 +00:00
2015-07-09 14:41:19 +02:00
2015-07-09 14:41:19 +02:00
2015-07-09 14:41:19 +02:00
2015-07-09 14:41:19 +02:00
2015-07-09 14:41:19 +02:00
2015-07-09 14:41:19 +02:00
2015-07-09 14:41:19 +02:00
2015-07-16 20:41:07 +02:00
2015-07-16 20:41:07 +02:00
2015-07-10 16:21:50 +02:00
2015-07-01 18:58:01 +02:00
2015-07-09 14:41:19 +02:00
2015-07-16 12:18:30 +02:00
2015-07-03 04:36:31 +02:00
2015-07-12 19:56:54 -07:00
2015-07-17 00:16:45 +02:00
2015-07-08 01:32:04 +02:00
2015-07-13 19:11:56 +02:00
2015-07-16 12:18:30 +02:00
2015-07-16 15:03:02 +02:00
2015-07-16 15:03:02 +02:00
2015-07-02 23:31:16 +02:00
2015-07-16 12:18:30 +02:00
2015-07-07 23:35:00 +02:00
2015-06-28 17:00:21 +02:00