[SCM] libav/experimental: set codec_tag from codec_id if its not set and can be set based on the AVCodecTag tables
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 15:55:13 UTC 2013
The following commit has been merged in the experimental branch:
commit 5ecfa9f5fcc434be7b93b5abacfa336f54cac671
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Sun Jan 21 12:31:58 2007 +0000
set codec_tag from codec_id if its not set and can be set based on the AVCodecTag tables
Originally committed as revision 7600 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 7e25478..cebe628 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -2182,6 +2182,17 @@ int av_write_header(AVFormatContext *s)
}
break;
}
+
+ if(s->oformat->codec_tag){
+ if(st->codec->codec_tag){
+ //FIXME
+ //check that tag + id is in the table
+ //if neither is in the table -> ok
+ //if tag is in the table with another id -> FAIL
+ //if id is in the table with another tag -> FAIL unless strict < ?
+ }else
+ st->codec->codec_tag= av_codec_get_tag(s->oformat->codec_tag, st->codec->codec_id);
+ }
}
if (!s->priv_data && s->oformat->priv_data_size > 0) {
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list