summaryrefslogtreecommitdiff
path: root/libavformat/mp3enc.c
diff options
context:
space:
mode:
authorDiogo Franco <diogomfranco@gmail.com>2011-08-16 09:43:23 +0000
committerAnton Khirnov <anton@khirnov.net>2011-08-16 20:24:20 +0200
commitf1f298cd32b18bb910ff045df327ccb139628db7 (patch)
tree23be88c89cf517c58a0296ca3d93389eb1cd095d /libavformat/mp3enc.c
parentd8b999e2d0736751bb25edc3aa0651cdbf3cbf41 (diff)
downloadffmpeg-f1f298cd32b18bb910ff045df327ccb139628db7.tar.gz
Do not write ID3v1 tags by default
ID3v1 are legacy tags with several limitations; furthermore avconv/ffmpeg writes the tags in UTF-8 which probably has near-0 software support. Add a -write_id3v1 option to be able to turn it on; disabled by default. Signed-off-by: Anton Khirnov <anton@khirnov.net>
Diffstat (limited to 'libavformat/mp3enc.c')
-rw-r--r--libavformat/mp3enc.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/libavformat/mp3enc.c b/libavformat/mp3enc.c
index e702e3b502..3704e49320 100644
--- a/libavformat/mp3enc.c
+++ b/libavformat/mp3enc.c
@@ -135,6 +135,7 @@ static int id3v2_put_ttag(AVFormatContext *s, const char *str1, const char *str2
typedef struct MP3Context {
const AVClass *class;
int id3v2_version;
+ int write_id3v1;
int64_t nb_frames_offset;
} MP3Context;
@@ -144,7 +145,7 @@ static int mp3_write_trailer(struct AVFormatContext *s)
MP3Context *mp3 = s->priv_data;
/* write the id3v1 tag */
- if (id3v1_create_tag(s, buf) > 0) {
+ if (mp3 && mp3->write_id3v1 && id3v1_create_tag(s, buf) > 0) {
avio_write(s->pb, buf, ID3v1_TAG_SIZE);
}
@@ -178,6 +179,8 @@ AVOutputFormat ff_mp2_muxer = {
static const AVOption options[] = {
{ "id3v2_version", "Select ID3v2 version to write. Currently 3 and 4 are supported.",
offsetof(MP3Context, id3v2_version), FF_OPT_TYPE_INT, {.dbl = 4}, 3, 4, AV_OPT_FLAG_ENCODING_PARAM},
+ { "write_id3v1", "Enable ID3v1 writing. ID3v1 tags are written in UTF-8 which may not be supported by most software.",
+ offsetof(MP3Context, write_id3v1), FF_OPT_TYPE_INT, {.dbl = 0}, 0, 1, AV_OPT_FLAG_ENCODING_PARAM},
{ NULL },
};