[FFmpeg-cvslog] avformat/movenc: correct write_colr warning placement

Gyan Doshi git at videolan.org
Thu Dec 15 11:59:21 EET 2022


ffmpeg | branch: master | Gyan Doshi <ffmpeg at gyani.pro> | Mon Dec 12 10:08:49 2022 +0530| [9adf02247cd5f1c6cc404ab3dad317a40f4f6e0c] | committer: Gyan Doshi

avformat/movenc: correct write_colr warning placement

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

Reviewed-by: Zhao Zhili <quinkblack at foxmail.com>
Signed-off-by: Gyan Doshi <ffmpeg at gyani.pro>

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

 libavformat/movenc.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index 7b00e65cdd..7d49892283 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -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)) {
             int prefer_icc = mov->flags & FF_MOV_FLAG_PREFER_ICC || !has_color_info;
             mov_write_colr_tag(pb, track, prefer_icc);
-        } 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");
         }
+    } 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 or AVIF.\n");
     }
+
     if (track->mode == MODE_MOV || track->mode == MODE_MP4) {
         mov_write_clli_tag(pb, track);
         mov_write_mdcv_tag(pb, track);



More information about the ffmpeg-cvslog mailing list