generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Support strn tag in avidec.

Browse Source 
Originally committed as revision 21643 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer
2010-02-05 12:16:59 +00:00
parent 1ac0893799
commit 7a9af8ec19
1 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
libavformat/avidec.c
View File

@@ -227,7 +227,7 @@ static void clean_index(AVFormatContext *s){
} }
} }
static int avi_read_tag(AVFormatContext *s, const char *key, unsigned int size) static int avi_read_tag(AVFormatContext *s, AVStream *st, const char *key, unsigned int size)
{ {
ByteIOContext *pb = s->pb; ByteIOContext *pb = s->pb;
char *value; char *value;
@@ -239,8 +239,13 @@ static int avi_read_tag(AVFormatContext *s, const char *key, unsigned int size)
value = av_malloc(size+1); value = av_malloc(size+1);
if (!value) if (!value)
return -1; return -1;
get_strz(pb, value, size); get_buffer(pb, value, size);
value[size]=0;
if(st)
return av_metadata_set2(&st->metadata, key, value,
AV_METADATA_DONT_STRDUP_VAL);
else
return av_metadata_set2(&s->metadata, key, value, return av_metadata_set2(&s->metadata, key, value,
AV_METADATA_DONT_STRDUP_VAL); AV_METADATA_DONT_STRDUP_VAL);
} }
@@ -602,26 +607,31 @@ static int avi_read_header(AVFormatContext *s, AVFormatParameters *ap)
url_fseek(pb, size, SEEK_CUR); url_fseek(pb, size, SEEK_CUR);
break; break;
case MKTAG('I', 'N', 'A', 'M'): case MKTAG('I', 'N', 'A', 'M'):
avi_read_tag(s, "Title", size); avi_read_tag(s, NULL, "Title", size);
break; break;
case MKTAG('I', 'A', 'R', 'T'): case MKTAG('I', 'A', 'R', 'T'):
avi_read_tag(s, "Artist", size); avi_read_tag(s, NULL, "Artist", size);
break; break;
case MKTAG('I', 'C', 'O', 'P'): case MKTAG('I', 'C', 'O', 'P'):
avi_read_tag(s, "Copyright", size); avi_read_tag(s, NULL, "Copyright", size);
break; break;
case MKTAG('I', 'C', 'M', 'T'): case MKTAG('I', 'C', 'M', 'T'):
avi_read_tag(s, "Comment", size); avi_read_tag(s, NULL, "Comment", size);
break; break;
case MKTAG('I', 'G', 'N', 'R'): case MKTAG('I', 'G', 'N', 'R'):
avi_read_tag(s, "Genre", size); avi_read_tag(s, NULL, "Genre", size);
break; break;
case MKTAG('I', 'P', 'R', 'D'): case MKTAG('I', 'P', 'R', 'D'):
avi_read_tag(s, "Album", size); avi_read_tag(s, NULL, "Album", size);
break; break;
case MKTAG('I', 'P', 'R', 'T'): case MKTAG('I', 'P', 'R', 'T'):
avi_read_tag(s, "Track", size); avi_read_tag(s, NULL, "Track", size);
break; break;
case MKTAG('s', 't', 'r', 'n'):
if(s->nb_streams){
avi_read_tag(s, s->streams[s->nb_streams-1], "Title", size);
break;
}
default: default:
if(size > 1000000){ if(size > 1000000){
av_log(s, AV_LOG_ERROR, "Something went wrong during header parsing, " av_log(s, AV_LOG_ERROR, "Something went wrong during header parsing, "