virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

id3v2: prefer TDRC for date over TDRL.

Browse Source 
TDRL is what we used as a replacement of TYER, and, according to
http://id3.org/id3v2.4.0-changes :
    TYER - Year
        This frame is replaced by the TDRC frame, 'Recording time'
        [F:4.2.5].
So change TDRL usages to TDRC.

Fixes ticket #3694

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Benoit Fouet
2014-11-04 13:54:43 +01:00
committed by Michael Niedermayer
parent 3dae05f4f7
commit dc351e1381
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/id3v2.c
View File

@@ -60,8 +60,8 @@ const AVMetadataConv ff_id3v2_34_metadata_conv[] = {
const AVMetadataConv ff_id3v2_4_metadata_conv[] = { const AVMetadataConv ff_id3v2_4_metadata_conv[] = {
{ "TCMP", "compilation" }, { "TCMP", "compilation" },
{ "TDRL", "date" },
{ "TDRC", "date" }, { "TDRC", "date" },
{ "TDRL", "date" },
{ "TDEN", "creation_time" }, { "TDEN", "creation_time" },
{ "TSOA", "album-sort" }, { "TSOA", "album-sort" },
{ "TSOP", "artist-sort" }, { "TSOP", "artist-sort" },

2
libavformat/mp3enc.c
View File

@@ -58,7 +58,7 @@ static int id3v1_create_tag(AVFormatContext *s, uint8_t *buf)
count += id3v1_set_string(s, "TIT2", buf + 3, 30 + 1); //title count += id3v1_set_string(s, "TIT2", buf + 3, 30 + 1); //title
count += id3v1_set_string(s, "TPE1", buf + 33, 30 + 1); //author|artist count += id3v1_set_string(s, "TPE1", buf + 33, 30 + 1); //author|artist
count += id3v1_set_string(s, "TALB", buf + 63, 30 + 1); //album count += id3v1_set_string(s, "TALB", buf + 63, 30 + 1); //album
count += id3v1_set_string(s, "TDRL", buf + 93, 4 + 1); //date count += id3v1_set_string(s, "TDRC", buf + 93, 4 + 1); //date
count += id3v1_set_string(s, "comment", buf + 97, 30 + 1); count += id3v1_set_string(s, "comment", buf + 97, 30 + 1);
if ((tag = av_dict_get(s->metadata, "TRCK", NULL, 0))) { //track if ((tag = av_dict_get(s->metadata, "TRCK", NULL, 0))) { //track
buf[125] = 0; buf[125] = 0;