diff options
| author | Anton Khirnov <wyskas@gmail.com> | 2010-10-16 13:07:20 +0000 |
|---|---|---|
| committer | Aurelien Jacobs <aurel@gnuage.org> | 2010-10-16 13:07:20 +0000 |
| commit | d60a9f52eb42dc76dea9996c8ba3567ae98a9a04 (patch) | |
| tree | c65353c79bfe2fb84c66584ea4336d124246bf3e | |
| parent | a7e5a832c4839f83ea270886f7400efb56307f6e (diff) | |
| download | ffmpeg-d60a9f52eb42dc76dea9996c8ba3567ae98a9a04.tar.gz | |
lavf: simplify setting the encoder ident tag.
patch by Anton Khirnov anton _at_ khirnov _dot_ net
Originally committed as revision 25504 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavformat/utils.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index 289b91ca78..23d0a3b0d5 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -2755,16 +2755,7 @@ int av_write_header(AVFormatContext *s) /* set muxer identification string */ if (!(s->streams[0]->codec->flags & CODEC_FLAG_BITEXACT)) { - AVMetadata *m; - AVMetadataTag *t; - - if (!(m = av_mallocz(sizeof(AVMetadata)))) - return AVERROR(ENOMEM); - av_metadata_set2(&m, "encoder", LIBAVFORMAT_IDENT, 0); - metadata_conv(&m, s->oformat->metadata_conv, NULL); - if ((t = av_metadata_get(m, "", NULL, AV_METADATA_IGNORE_SUFFIX))) - av_metadata_set2(&s->metadata, t->key, t->value, 0); - av_metadata_free(&m); + av_metadata_set2(&s->metadata, "encoder", LIBAVFORMAT_IDENT, 0); } if(s->oformat->write_header){ |