[FFmpeg-cvslog] id3v2: do not export APIC description if empty

wm4 git at videolan.org
Fri May 8 01:19:18 CEST 2015


ffmpeg | branch: master | wm4 <nfxjfg at googlemail.com> | Thu May  7 23:56:36 2015 +0200| [b697b297b77f73c932307120e32c187d521d2ff7] | committer: Michael Niedermayer

id3v2: do not export APIC description if empty

APIC tags always have a description. Tag writers obviously leave it
empty if there is no description. In this case, libavformat would export
"" as title. Do not set the title instead.

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b697b297b77f73c932307120e32c187d521d2ff7
---

 libavformat/id3v2.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libavformat/id3v2.c b/libavformat/id3v2.c
index a8273e2..1c57dd9 100644
--- a/libavformat/id3v2.c
+++ b/libavformat/id3v2.c
@@ -1082,7 +1082,8 @@ 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;
-        av_dict_set(&st->metadata, "title",   apic->description, 0);
+        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);



More information about the ffmpeg-cvslog mailing list