diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-16 14:37:50 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-16 14:37:50 +0200 |
| commit | 744e4429cf9a2ac5c7c1e4ed8bfbb6f9f09a882a (patch) | |
| tree | 9ce10189b728f61f475e5d3b3933c557b892a084 | |
| parent | 197bbcf44c2834fd9f5bef93f9254c097ebc0975 (diff) | |
| download | ffmpeg-744e4429cf9a2ac5c7c1e4ed8bfbb6f9f09a882a.tar.gz | |
mp3enc: merge mp2/mp3_write_trailer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/mp3enc.c | 24 |
1 files changed, 3 insertions, 21 deletions
diff --git a/libavformat/mp3enc.c b/libavformat/mp3enc.c index 3a59efcd0f..3c7c4aad44 100644 --- a/libavformat/mp3enc.c +++ b/libavformat/mp3enc.c @@ -341,7 +341,7 @@ static void mp3_update_xing(AVFormatContext *s) 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]; 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); } - /* write number of frames */ - if (mp3->xing_offset) { - 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); - } + if (mp3->xing_offset) + mp3_update_xing(s); return 0; } @@ -498,20 +494,6 @@ static int mp3_write_header(struct AVFormatContext *s) 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 = { .name = "mp3", .long_name = NULL_IF_CONFIG_SMALL("MP3 (MPEG audio layer 3)"), |