Michael Niedermayer
03b88f6b39
Merge remote-tracking branch 'cigaes/master'
...
* cigaes/master:
lavfi/drawtext: allow to format pts as HH:MM:SS.mmm.
lavf/concatdec: implement automatic conversions.
lavf/concatdec: reindent after last commit.
lavf/concatdec: always do stream matching.
lavf/concatdec: check match_streams() return value.
lavf/concatdec: use a structure for each stream.
ffprobe: use the codec descriptor if no decoder was found.
lavf/matroska: add "binary" pseudo-MIME type.
lavc: minor bump and APIchanges for AVCodecDescriptor.mime_types.
lavc: add a mime_types field to codec descriptors.
lavc: add AV_CODEC_ID_BIN_DATA.
lavc: add codec descriptors for TTF and OTF.
lavc: add codec descriptors for deprecated ids.
lavc/codec_desc: add separation comment.
tools/ffhash: implement base64 output.
tools/ffhash: use av_hash_final_hex().
lavu/hash: add hash_final helpers.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-29 19:29:48 +02:00
..
2013-12-22 01:48:33 +01:00
2014-03-16 22:38:05 +01:00
2014-03-01 01:56:25 +01:00
2013-12-25 17:14:32 +01:00
2014-04-19 04:25:01 +02:00
2014-01-24 22:50:06 +01:00
2014-04-19 16:24:27 +02:00
2014-04-11 23:38:53 +02:00
2013-12-25 17:14:32 +01:00
2014-04-24 18:01:30 +02:00
2014-03-11 21:05:34 +01:00
2014-01-29 00:44:59 +01:00
2014-04-19 04:25:01 +02:00
2014-04-24 17:47:49 +02:00
2014-03-02 21:44:44 +01:00
2014-04-21 05:27:08 +02:00
2014-04-27 15:14:32 +02:00
2014-04-14 15:34:38 +02:00
2014-04-18 00:38:07 +02:00
2014-03-30 15:00:03 +02:00
2014-03-26 23:58:48 +01:00
2014-04-18 00:38:07 +02:00
2014-01-17 11:11:08 +01:00
2014-03-11 21:05:34 +01:00
2014-03-12 05:09:28 +01:00
2014-04-24 18:02:20 +02:00
2014-04-06 00:34:09 +02:00
2014-04-29 13:25:59 +02:00
2014-03-11 21:05:34 +01:00
2014-03-11 21:05:34 +01:00
2014-04-19 04:25:01 +02:00
2014-03-11 21:05:34 +01:00
2014-03-11 21:05:34 +01:00
2013-12-25 17:23:55 +01:00
2014-01-05 00:51:38 +01:00
2014-01-31 17:32:32 +01:00
2014-04-16 00:23:31 +02:00
2014-01-24 22:41:06 +01:00
2014-04-27 14:50:14 +02:00
2014-01-16 00:38:27 +01:00
2014-03-11 21:05:34 +01:00
2014-02-28 00:07:31 +01:00
2014-04-05 01:13:47 +02:00
2014-03-09 22:59:46 +01:00
2014-03-11 21:05:34 +01:00
2013-12-21 13:52:10 +01:00
2014-04-23 21:54:13 +02:00
2014-01-31 03:08:49 +01:00
2014-03-10 23:38:01 +01:00
2014-03-10 23:38:01 +01:00
2014-04-12 03:14:52 +03:00
2014-04-29 16:37:22 +02:00
2014-04-16 01:37:38 +02:00
2014-03-23 05:56:35 +01:00
2014-03-03 17:04:57 +01:00
2014-04-16 19:41:41 +02:00
2014-04-16 19:41:41 +02:00
2014-04-24 18:01:30 +02:00
2014-04-19 04:25:01 +02:00
2014-01-24 22:52:33 +01:00
2013-12-25 17:38:29 +01:00
2014-02-03 02:04:38 +01:00
2014-04-20 00:22:20 +02:00
2014-04-29 18:47:27 +02:00
2014-03-28 23:54:51 +01:00
2014-04-01 01:13:09 +02:00
2014-03-28 23:54:51 +01:00
2014-04-14 21:40:59 +02:00
2014-04-05 02:18:09 +02:00
2014-04-22 20:44:31 +02:00
2014-04-19 16:24:26 +02:00
2014-01-22 00:33:38 +01:00
2013-12-23 16:28:44 +01:00
2014-02-14 01:51:17 +01:00
2014-03-11 13:22:49 +01:00
2014-01-14 01:59:23 +01:00
2014-02-28 00:04:29 +01:00
2014-03-11 21:05:34 +01:00
2014-04-19 20:17:33 +02:00
2014-04-29 13:25:59 +02:00
2014-04-27 12:52:34 +02:00
2014-04-26 22:01:48 +02:00
2014-01-17 23:09:52 +01:00
2014-03-03 23:33:47 +01:00
2014-04-27 15:34:27 +02:00
2013-12-26 13:24:43 +01:00
2014-04-24 18:01:30 +02:00
2014-04-24 18:01:30 +02:00
2014-04-10 21:25:51 +02:00
2014-04-25 21:51:34 +02:00
2014-03-23 03:22:20 +01:00
2014-04-18 00:38:07 +02:00
2014-04-13 20:03:24 +02:00
2013-12-26 00:11:49 +01:00
2013-12-25 17:38:29 +01:00
2014-03-24 05:28:07 +01:00
2014-04-27 14:54:29 +02:00
2014-04-16 17:20:07 +02:00
2014-04-16 02:35:50 +02:00
2014-04-27 14:24:29 +02:00
2014-04-27 14:24:29 +02:00
2014-02-01 21:09:14 -08:00
2014-04-23 06:55:33 +02:00
2014-04-19 20:17:33 +02:00
2014-03-11 21:05:34 +01:00
2014-03-19 20:39:05 +01:00
2014-03-19 20:54:35 +01:00
2014-04-04 02:18:32 +02:00
2014-04-13 23:39:49 +02:00
2014-01-07 13:16:55 +01:00
2013-12-20 18:08:58 +01:00
2014-04-09 23:37:55 +02:00
2014-04-09 23:37:55 +02:00
2014-04-09 23:37:55 +02:00
2014-01-24 04:17:15 +01:00
2013-12-25 17:38:29 +01:00
2014-04-27 15:14:32 +02:00
2014-02-05 22:36:42 +01:00
2014-04-04 15:56:52 +02:00
2014-04-26 21:31:15 +02:00
2014-01-06 15:28:24 +01:00
2014-02-05 21:16:36 +01:00
2014-04-24 18:01:30 +02:00
2013-12-30 04:05:27 +01:00
2014-04-19 04:25:01 +02:00
2014-03-12 13:33:14 +01:00
2014-02-04 15:37:05 +01:00
2014-03-28 04:32:05 +01:00
2014-04-20 20:56:02 +02:00
2014-02-10 07:41:21 +01:00
2014-01-11 02:28:17 +01:00
2014-04-21 01:29:08 +02:00
2013-12-20 23:04:51 +01:00
2014-02-09 14:29:07 +00:00
2014-04-18 01:16:27 +02:00
2014-04-17 21:45:58 +02:00
2014-04-23 20:47:13 +02:00
2014-02-12 15:59:15 +01:00
2014-02-12 15:59:15 +01:00
2014-04-09 23:21:38 +02:00
2013-12-25 17:38:29 +01:00
2014-03-11 21:05:34 +01:00
2014-03-11 21:05:34 +01:00
2013-12-25 17:38:30 +01:00
2014-04-23 15:10:42 +02:00
2014-03-07 14:09:35 +01:00
2014-04-14 14:28:22 +02:00
2014-01-23 20:15:21 +01:00
2014-04-24 18:01:30 +02:00
2014-03-12 13:33:14 +01:00
2014-03-12 13:33:14 +01:00
2014-03-04 22:54:13 +01:00
2014-04-10 21:57:04 +02:00
2014-04-06 22:04:03 +02:00
2014-03-12 13:33:14 +01:00
2014-03-12 13:33:14 +01:00
2014-04-24 18:01:30 +02:00
2014-02-26 17:46:45 +00:00
2014-01-07 15:02:31 +01:00
2014-04-29 15:57:43 +02:00
2013-12-20 01:03:19 +01:00
2013-12-29 13:25:13 +01:00
2014-03-11 21:05:34 +01:00
2014-03-11 21:05:34 +01:00
2014-04-06 23:29:47 +02:00
2014-03-11 21:05:34 +01:00
2014-03-08 12:36:57 +01:00
2013-12-19 05:07:22 +01:00
2014-01-07 19:48:13 +01:00
2013-12-25 18:42:26 +01:00
2014-04-26 21:08:44 +02:00
2014-01-23 14:33:56 +01:00
2014-04-22 13:30:23 +02:00
2014-03-22 16:40:46 +01:00
2014-02-11 10:29:02 +01:00
2014-04-28 18:51:15 +02:00
2013-12-25 17:38:30 +01:00
2014-04-19 20:17:33 +02:00
2014-01-01 16:53:54 +01:00
2014-04-19 03:54:10 +02:00
2013-12-29 14:06:47 +01:00
2014-01-07 04:09:19 +01:00
2013-12-25 17:38:30 +01:00
2013-12-23 19:43:09 +01:00
2013-12-23 19:43:09 +01:00
2014-04-04 17:20:38 +02:00
2014-03-30 16:36:47 +02:00
2014-04-15 13:51:48 +02:00
2014-01-17 16:18:40 +01:00