[FFmpeg-devel] [PATCH 2/5] lavf/concatdec: check match_streams() return value.

Nicolas George george at nsup.org
Tue Apr 29 14:03:17 CEST 2014

Le sextidi 6 floréal, an CCXXII, Michael Niedermayer a écrit :
> the feature itself sounds nice and useful


I believe you can merge the following commits from my tree, please:

b804eb4 lavu/hash: add hash_final helpers.
3926a30 tools/ffhash: use av_hash_final_hex().
73c4b6c tools/ffhash: implement base64 output.
e419e29 lavc/codec_desc: add separation comment.
fa7bc7e lavc: add codec descriptors for deprecated ids.
892e2c2 lavc: add codec descriptors for TTF and OTF.
6ea1196 lavc: add AV_CODEC_ID_BIN_DATA.
1bf6396 lavc: add a mime_types field to codec descriptors.
70beebe lavc: minor bump and APIchanges for AVCodecDescriptor.mime_types.
c9212ab lavf/matroska: add "binary" pseudo-MIME type.
43ca94a ffprobe: use the codec descriptor if no decoder was found.
e973cf0 lavf/concatdec: use a structure for each stream.
c27939d lavf/concatdec: check match_streams() return value.
b24d6c5 lavf/concatdec: always do stream matching.
9d24a53 lavf/concatdec: reindent after last commit.
50ed6e3 lavf/concatdec: implement automatic conversions.
41334fc lavfi/drawtext: allow to format pts as HH:MM:SS.mmm.


  Nicolas George
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20140429/c0022f1c/attachment.asc>

More information about the ffmpeg-devel mailing list