diff options
| author | Anton Khirnov <wyskas@gmail.com> | 2010-02-16 16:32:25 +0000 |
|---|---|---|
| committer | Ronald S. Bultje <rsbultje@gmail.com> | 2010-02-16 16:32:25 +0000 |
| commit | ed7694d8cf4633da444237f4df7efc48936419d2 (patch) | |
| tree | 6ceaa52216a94a3914e7978a8dc0f365e68458c7 /libavformat/mp3.c | |
| parent | 114315994bc08812eeef51eaace455d86b5098d5 (diff) | |
| download | ffmpeg-ed7694d8cf4633da444237f4df7efc48936419d2.tar.gz | |
Set lavf identification string globally in av_write_header(), rather
than inside the muxers. Remove special handling of "encoder" tags from
AVI and MP3 muxers.
Patch by Anton Khirnov <wyskas gmail com>.
Originally committed as revision 21850 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/mp3.c')
| -rw-r--r-- | libavformat/mp3.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/libavformat/mp3.c b/libavformat/mp3.c index e2f230acad..4579773369 100644 --- a/libavformat/mp3.c +++ b/libavformat/mp3.c @@ -313,7 +313,7 @@ static int mp3_write_header(struct AVFormatContext *s) while ((t = av_metadata_get(s->metadata, "", t, AV_METADATA_IGNORE_SUFFIX))) { uint32_t tag = 0; - if (t->key[0] == 'T' && strcmp(t->key, "TSSE")) { + if (t->key[0] == 'T' && strlen(t->key) == 4) { int i; for (i = 0; *ff_id3v2_tags[i]; i++) if (AV_RB32(t->key) == AV_RB32(ff_id3v2_tags[i])) { @@ -338,11 +338,6 @@ static int mp3_write_header(struct AVFormatContext *s) av_free(buf); } } - if(!(s->streams[0]->codec->flags & CODEC_FLAG_BITEXACT)) { - totlen += strlen(LIBAVFORMAT_IDENT) + ID3v2_HEADER_SIZE + 2; - id3v2_put_ttag(s, LIBAVFORMAT_IDENT, strlen(LIBAVFORMAT_IDENT) + 1, - MKBETAG('T', 'S', 'S', 'E')); - } cur_pos = url_ftell(s->pb); url_fseek(s->pb, size_pos, SEEK_SET); |