diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2010-02-05 12:16:59 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2010-02-05 12:16:59 +0000 |
| commit | 7a9af8ec198f5d9146c6381cc69fa87ab24dd0c5 (patch) | |
| tree | 928a743c97c7b980b6c515ce1f51afac3d714833 | |
| parent | 1ac08937991e1d68f8e9d5c54097fbf1eeb8a152 (diff) | |
| download | ffmpeg-7a9af8ec198f5d9146c6381cc69fa87ab24dd0c5.tar.gz | |
Support strn tag in avidec.
Originally committed as revision 21643 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavformat/avidec.c | 28 |
1 files changed, 19 insertions, 9 deletions
diff --git a/libavformat/avidec.c b/libavformat/avidec.c index a825733a0a..ea253aae76 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -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; char *value; @@ -239,8 +239,13 @@ static int avi_read_tag(AVFormatContext *s, const char *key, unsigned int size) value = av_malloc(size+1); if (!value) 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, AV_METADATA_DONT_STRDUP_VAL); } @@ -602,26 +607,31 @@ static int avi_read_header(AVFormatContext *s, AVFormatParameters *ap) url_fseek(pb, size, SEEK_CUR); break; case MKTAG('I', 'N', 'A', 'M'): - avi_read_tag(s, "Title", size); + avi_read_tag(s, NULL, "Title", size); break; case MKTAG('I', 'A', 'R', 'T'): - avi_read_tag(s, "Artist", size); + avi_read_tag(s, NULL, "Artist", size); break; case MKTAG('I', 'C', 'O', 'P'): - avi_read_tag(s, "Copyright", size); + avi_read_tag(s, NULL, "Copyright", size); break; case MKTAG('I', 'C', 'M', 'T'): - avi_read_tag(s, "Comment", size); + avi_read_tag(s, NULL, "Comment", size); break; case MKTAG('I', 'G', 'N', 'R'): - avi_read_tag(s, "Genre", size); + avi_read_tag(s, NULL, "Genre", size); break; case MKTAG('I', 'P', 'R', 'D'): - avi_read_tag(s, "Album", size); + avi_read_tag(s, NULL, "Album", size); break; case MKTAG('I', 'P', 'R', 'T'): - avi_read_tag(s, "Track", size); + avi_read_tag(s, NULL, "Track", size); 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: if(size > 1000000){ av_log(s, AV_LOG_ERROR, "Something went wrong during header parsing, " |