Merge commit '33d18982fa03feb061c8f744a4f0a9175c1f63ab'

[ffmpeg] / libavformat / id3v2enc.c

diff --git a/libavformat/id3v2enc.c b/libavformat/id3v2enc.c
index 8b804c4d4a168cdf3eb686ee69da25dcc88aedd4..781974128b5e1f8710cda4f904ee64d8a06632c1 100644 (file)
--- a/libavformat/id3v2enc.c
+++ b/libavformat/id3v2enc.c
@@ -242,6 +242,7 @@ int ff_id3v2_write_metadata(AVFormatContext *s, ID3v2EncContext *id3)
                                   ID3v2_ENCODING_UTF8;
     int i, ret;
 
+    ff_standardize_creation_time(s);
     if ((ret = write_metadata(s->pb, &s->metadata, id3, enc)) < 0)
         return ret;
 
@@ -268,7 +269,7 @@ int ff_id3v2_write_apic(AVFormatContext *s, ID3v2EncContext *id3, AVPacket *pkt)
 
     /* get the mimetype*/
     while (mime->id != AV_CODEC_ID_NONE) {
-        if (mime->id == st->codec->codec_id) {
+        if (mime->id == st->codecpar->codec_id) {
             mimetype = mime->str;
             break;
         }