Message ID | 20221212044144.957-1-ffmpeg@gyani.pro |
---|---|
State | New |
Headers | show |
Series | [FFmpeg-devel,v2] avformat/movenc: remove write_colr warning | expand |
Context | Check | Description |
---|---|---|
yinshiyou/make_loongarch64 | success | Make finished |
yinshiyou/make_fate_loongarch64 | success | Make fate finished |
andriy/make_x86 | success | Make finished |
andriy/make_fate_x86 | success | Make fate finished |
On 2022-12-12 10:11 am, Gyan Doshi wrote: > The old warning is no longer applicable after this block was recomposed in > c5b20cfe19. The block is only active for supported formats. Plan to push tomorrow. > --- > libavformat/movenc.c | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/libavformat/movenc.c b/libavformat/movenc.c > index 7b00e65cdd..d1bef25147 100644 > --- a/libavformat/movenc.c > +++ b/libavformat/movenc.c > @@ -2330,8 +2330,6 @@ 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"); > } > } > if (track->mode == MODE_MOV || track->mode == MODE_MP4) {
> On Dec 14, 2022, at 18:51, Gyan Doshi <ffmpeg@gyani.pro> wrote: > > > On 2022-12-12 10:11 am, Gyan Doshi wrote: >> The old warning is no longer applicable after this block was recomposed in >> c5b20cfe19. The block is only active for supported formats. > > Plan to push tomorrow. > > >> --- >> libavformat/movenc.c | 2 -- >> 1 file changed, 2 deletions(-) >> >> diff --git a/libavformat/movenc.c b/libavformat/movenc.c >> index 7b00e65cdd..d1bef25147 100644 >> --- a/libavformat/movenc.c >> +++ b/libavformat/movenc.c >> @@ -2330,8 +2330,6 @@ 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"); >> } >> } Rather than remove the code block, I think the ‘else if’ should be paired with the outer ‘if’. >> if (track->mode == MODE_MOV || track->mode == MODE_MP4) { > > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 7b00e65cdd..d1bef25147 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -2330,8 +2330,6 @@ 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"); } } if (track->mode == MODE_MOV || track->mode == MODE_MP4) {