virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

avformat/movenc: correct write_colr warning placement

Browse Source 
The old warning is no longer applicable in the inner block after
c5b20cfe19.

Reviewed-by: Zhao Zhili <quinkblack@foxmail.com>
Signed-off-by: Gyan Doshi <ffmpeg@gyani.pro>
This commit is contained in:
Gyan Doshi
2022-12-12 09:50:49 +05:30
parent 262e7439c6
commit 9adf02247c
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libavformat/movenc.c
View File

@@ -2330,10 +2330,11 @@ static int mov_write_video_tag(AVFormatContext *s, AVIOContext *pb, MOVMuxContex
av_stream_get_side_data(track->st, AV_PKT_DATA_ICC_PROFILE, NULL)) { av_stream_get_side_data(track->st, AV_PKT_DATA_ICC_PROFILE, NULL)) {
int prefer_icc = mov->flags & FF_MOV_FLAG_PREFER_ICC || !has_color_info; int prefer_icc = mov->flags & FF_MOV_FLAG_PREFER_ICC || !has_color_info;
mov_write_colr_tag(pb, track, prefer_icc); mov_write_colr_tag(pb, track, prefer_icc);
}
} else if (mov->flags & FF_MOV_FLAG_WRITE_COLR) { } else if (mov->flags & FF_MOV_FLAG_WRITE_COLR) {
av_log(mov->fc, AV_LOG_WARNING, "Not writing 'colr' atom. Format is not MOV or MP4.\n"); av_log(mov->fc, AV_LOG_WARNING, "Not writing 'colr' atom. Format is not MOV or MP4 or AVIF.\n");
}
} }
if (track->mode == MODE_MOV || track->mode == MODE_MP4) { if (track->mode == MODE_MOV || track->mode == MODE_MP4) {
mov_write_clli_tag(pb, track); mov_write_clli_tag(pb, track);
mov_write_mdcv_tag(pb, track); mov_write_mdcv_tag(pb, track);