03b88f6b39
* 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>
FFmpeg README ------------- 1) Documentation ---------------- * Read the documentation in the doc/ directory in git. You can also view it online at http://ffmpeg.org/documentation.html 2) Licensing ------------ * See the LICENSE file. 3) Build and Install -------------------- * See the INSTALL file.