[FFmpeg-cvslog] matroskaenc: implement query_codec()
Anton Khirnov
git at videolan.org
Wed Aug 17 14:42:49 CEST 2011
ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Thu Aug 11 20:35:46 2011 +0200| [15c14ce6b2473528f7114028dc0732a4b467b624] | committer: Anton Khirnov
matroskaenc: implement query_codec()
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=15c14ce6b2473528f7114028dc0732a4b467b624
---
libavformat/matroskaenc.c | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
index b08f546..6ba750f 100644
--- a/libavformat/matroskaenc.c
+++ b/libavformat/matroskaenc.c
@@ -1191,6 +1191,22 @@ static int mkv_write_trailer(AVFormatContext *s)
return 0;
}
+static int mkv_query_codec(enum CodecID codec_id, int std_compliance)
+{
+ int i;
+ for (i = 0; ff_mkv_codec_tags[i].id != CODEC_ID_NONE; i++)
+ if (ff_mkv_codec_tags[i].id == codec_id)
+ return 1;
+
+ if (std_compliance < FF_COMPLIANCE_NORMAL) { // mkv theoretically supports any
+ enum AVMediaType type = avcodec_get_type(codec_id); // video/audio through VFW/ACM
+ if (type == AVMEDIA_TYPE_VIDEO || type == AVMEDIA_TYPE_AUDIO)
+ return 1;
+ }
+
+ return 0;
+}
+
#if CONFIG_MATROSKA_MUXER
AVOutputFormat ff_matroska_muxer = {
.name = "matroska",
@@ -1206,6 +1222,7 @@ AVOutputFormat ff_matroska_muxer = {
.flags = AVFMT_GLOBALHEADER | AVFMT_VARIABLE_FPS,
.codec_tag = (const AVCodecTag* const []){ff_codec_bmp_tags, ff_codec_wav_tags, 0},
.subtitle_codec = CODEC_ID_SSA,
+ .query_codec = mkv_query_codec,
};
#endif
More information about the ffmpeg-cvslog
mailing list