1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-04 06:08:26 +02:00
FFmpeg/libavformat
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
..
2014-04-19 16:24:27 +02:00
2013-12-25 17:14:32 +01:00
2014-04-27 15:14:32 +02:00
2014-04-24 18:02:20 +02:00
2014-04-27 14:50:14 +02:00
2014-01-16 00:38:27 +01:00
2014-02-28 00:07:31 +01:00
2014-04-23 21:54:13 +02:00
2014-04-16 19:41:41 +02:00
2014-04-16 19:41:41 +02:00
2013-12-25 17:38:29 +01:00
2014-04-01 01:13:09 +02: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
2013-12-23 16:28:44 +01:00
2014-03-11 13:22:49 +01:00
2013-12-25 17:38:29 +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-20 20:56:02 +02:00
2014-02-09 14:29:07 +00:00
2013-12-25 17:38:29 +01:00
2013-12-25 17:38:30 +01:00
2014-04-23 15:10:42 +02:00
2014-03-04 22:54:13 +01:00
2014-03-08 12:36:57 +01:00
2014-04-15 13:51:48 +02:00