virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

id3v2: stop ignoring text encoding for chapter titles

Browse Source 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Paul B Mahol
2013-05-06 00:54:13 +00:00
parent 5a9e376049
commit f5846dc98c
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
libavformat/id3v2.c
View File

@@ -521,10 +521,11 @@ fail:
static void read_chapter(AVFormatContext *s, AVIOContext *pb, int taglen, char *tag, ID3v2ExtraMeta **extra_meta) static void read_chapter(AVFormatContext *s, AVIOContext *pb, int taglen, char *tag, ID3v2ExtraMeta **extra_meta)
{ {
AVRational time_base = {1, 1000}; AVRational time_base = {1, 1000};
char title[1024];
uint32_t start, end; uint32_t start, end;
uint8_t *dst = NULL;
int encoding;
taglen -= avio_get_str(pb, taglen, title, sizeof(title)); decode_str(s, pb, 0, &dst, &taglen);
if (taglen < 16) if (taglen < 16)
return; return;
@@ -538,14 +539,19 @@ static void read_chapter(AVFormatContext *s, AVIOContext *pb, int taglen, char *
avio_read(pb, tag, 4); avio_read(pb, tag, 4);
if (!memcmp(tag, "TIT2", 4)) { if (!memcmp(tag, "TIT2", 4)) {
taglen = FFMIN(taglen, avio_rb32(pb)); taglen = FFMIN(taglen, avio_rb32(pb));
if (taglen < 0) if (taglen < 0) {
av_free(dst);
return; return;
avio_skip(pb, 3); }
avio_get_str(pb, taglen, title, sizeof(title)); avio_skip(pb, 2);
encoding = avio_r8(pb);
av_freep(&dst);
decode_str(s, pb, encoding, &dst, &taglen);
} }
} }
avpriv_new_chapter(s, s->nb_chapters + 1, time_base, start, end, title); avpriv_new_chapter(s, s->nb_chapters + 1, time_base, start, end, dst);
av_free(dst);
} }
typedef struct ID3v2EMFunc { typedef struct ID3v2EMFunc {