virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Code Issues Releases Activity

avformat/matroskaenc: Warn that WebM doesn't support Attachments

Browse Source 
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>
This commit is contained in:
Andreas Rheinhardt 2019-11-02 18:56:31 +01:00
parent 4dd63ae86c
commit ef45cccc81
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libavformat/matroskaenc.c
View File

@ -1738,12 +1738,6 @@ static int mkv_write_header(AVFormatContext *s)
int ret, i, version = 2; int ret, i, version = 2;
int64_t creation_time; 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 || if (mkv->mode != MODE_WEBM ||
av_dict_get(s->metadata, "stereo_mode", NULL, 0) || av_dict_get(s->metadata, "stereo_mode", NULL, 0) ||
av_dict_get(s->metadata, "alpha_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; 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)); mkv->tracks = av_mallocz_array(s->nb_streams, sizeof(*mkv->tracks));
if (!mkv->tracks) { if (!mkv->tracks) {
return AVERROR(ENOMEM); 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 // ms precision is the de-facto standard timescale for mkv files
avpriv_set_pts_info(s->streams[i], 64, 1, 1000); 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; continue;
}
nb_tracks++; nb_tracks++;
track->track_num = mkv->is_dash ? mkv->dash_track_number : nb_tracks; track->track_num = mkv->is_dash ? mkv->dash_track_number : nb_tracks;