diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-10 22:50:22 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-10 22:51:38 +0200 |
| commit | 1cf81a2c509ebb0421ea6d0745eb3dbc99ac6f4c (patch) | |
| tree | 93532917ea6c4ee966a758f6837ddeefe410ff98 | |
| parent | f230451b7a6949af297259de78a480166d43fddd (diff) | |
| parent | 379e5603f4131e677ecf5ba79973dcd5603f28ea (diff) | |
| download | ffmpeg-1cf81a2c509ebb0421ea6d0745eb3dbc99ac6f4c.tar.gz | |
Merge commit '379e5603f4131e677ecf5ba79973dcd5603f28ea'
* commit '379e5603f4131e677ecf5ba79973dcd5603f28ea':
id3v2: Do not export empty APIC description
Conflicts:
libavformat/id3v2.c
See: b697b297b77f73c932307120e32c187d521d2ff7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/id3v2.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/id3v2.c b/libavformat/id3v2.c index 1c57dd9c43..49a4c387b8 100644 --- a/libavformat/id3v2.c +++ b/libavformat/id3v2.c @@ -1082,8 +1082,10 @@ int ff_id3v2_parse_apic(AVFormatContext *s, ID3v2ExtraMeta **extra_meta) st->disposition |= AV_DISPOSITION_ATTACHED_PIC; st->codec->codec_type = AVMEDIA_TYPE_VIDEO; st->codec->codec_id = apic->id; + if (apic->description[0]) av_dict_set(&st->metadata, "title", apic->description, 0); + av_dict_set(&st->metadata, "comment", apic->type, 0); av_init_packet(&st->attached_pic); |