RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

mp3enc: merge mp2/mp3_write_trailer 

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-09-16 14:37:50 +02:00
parent 197bbcf44c
commit 744e4429cf
1 changed files with 3 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
libavformat/mp3enc.c
View File

@ -341,7 +341,7 @@ static void mp3_update_xing(AVFormatContext *s)
avio_seek(s->pb, 0, SEEK_END); avio_seek(s->pb, 0, SEEK_END);
} }
static int mp2_write_trailer(struct AVFormatContext *s) static int mp3_write_trailer(struct AVFormatContext *s)
{ {
uint8_t buf[ID3v1_TAG_SIZE]; uint8_t buf[ID3v1_TAG_SIZE];
MP3Context *mp3 = s->priv_data; MP3Context *mp3 = s->priv_data;
@ -357,12 +357,8 @@ static int mp2_write_trailer(struct AVFormatContext *s)
avio_write(s->pb, buf, ID3v1_TAG_SIZE); avio_write(s->pb, buf, ID3v1_TAG_SIZE);
} }
/* write number of frames */ if (mp3->xing_offset)
if (mp3->xing_offset) { mp3_update_xing(s);
avio_seek(s->pb, mp3->xing_offset+8, SEEK_SET);
avio_wb32(s->pb, s->streams[mp3->audio_stream_idx]->nb_frames);
avio_seek(s->pb, 0, SEEK_END);
}
return 0; return 0;
} }
@ -498,20 +494,6 @@ static int mp3_write_header(struct AVFormatContext *s)
return 0; return 0;
} }
static int mp3_write_trailer(AVFormatContext *s)
{
MP3Context *mp3 = s->priv_data;
int ret=mp2_write_trailer(s);
if (ret < 0)
return ret;
if (mp3->xing_offset)
mp3_update_xing(s);
return 0;
}
AVOutputFormat ff_mp3_muxer = { AVOutputFormat ff_mp3_muxer = {
.name = "mp3", .name = "mp3",
.long_name = NULL_IF_CONFIG_SMALL("MP3 (MPEG audio layer 3)"), .long_name = NULL_IF_CONFIG_SMALL("MP3 (MPEG audio layer 3)"),