diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2019-11-02 18:56:31 +0100 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2020-04-21 07:41:21 +0200 |
| commit | ef45cccc81d5f0deff2c69d223bf0bd7c0012294 (patch) | |
| tree | dc0c86b4a3e9393333e7b382f4a42b20ca927824 | |
| parent | 4dd63ae86c311da269426803d440d907cd9f66a2 (diff) | |
| download | ffmpeg-ef45cccc81d5f0deff2c69d223bf0bd7c0012294.tar.gz | |
avformat/matroskaenc: Warn that WebM doesn't support Attachments
As WebM doesn't support Attachments, the Matroska muxer drops them when
in WebM mode. This happened silently until this commit which adds a
warning for this.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
| -rw-r--r-- | libavformat/matroskaenc.c | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 5e0346d341..936dfba2ee 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -1738,12 +1738,6 @@ static int mkv_write_header(AVFormatContext *s) int ret, i, version = 2; int64_t creation_time; - if (!strcmp(s->oformat->name, "webm")) { - mkv->mode = MODE_WEBM; - mkv->write_crc = 0; - } else - mkv->mode = MODE_MATROSKAv2; - if (mkv->mode != MODE_WEBM || av_dict_get(s->metadata, "stereo_mode", NULL, 0) || av_dict_get(s->metadata, "alpha_mode", NULL, 0)) @@ -2618,6 +2612,12 @@ static int mkv_init(struct AVFormatContext *s) s->internal->avoid_negative_ts_use_pts = 1; } + if (!strcmp(s->oformat->name, "webm")) { + mkv->mode = MODE_WEBM; + mkv->write_crc = 0; + } else + mkv->mode = MODE_MATROSKAv2; + mkv->tracks = av_mallocz_array(s->nb_streams, sizeof(*mkv->tracks)); if (!mkv->tracks) { return AVERROR(ENOMEM); @@ -2644,8 +2644,13 @@ static int mkv_init(struct AVFormatContext *s) // ms precision is the de-facto standard timescale for mkv files avpriv_set_pts_info(s->streams[i], 64, 1, 1000); - if (st->codecpar->codec_type == AVMEDIA_TYPE_ATTACHMENT) + if (st->codecpar->codec_type == AVMEDIA_TYPE_ATTACHMENT) { + if (mkv->mode == MODE_WEBM) { + av_log(s, AV_LOG_WARNING, "Stream %d will be ignored " + "as WebM doesn't support attachments.\n", i); + } continue; + } nb_tracks++; track->track_num = mkv->is_dash ? mkv->dash_track_number : nb_tracks; |