[FFmpeg-cvslog] avformat/mxfenc: dont warn about d10_channelcount being ignored if its not set

Michael Niedermayer git at videolan.org
Wed Aug 27 02:19:40 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Aug 22 22:36:55 2014 +0200| [9e8ab36f5419149bbaedd88fe0e25507d66a3c93] | committer: Michael Niedermayer

avformat/mxfenc: dont warn about d10_channelcount being ignored if its not set

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavformat/mxfenc.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c
index bba0115..6a6b7c2 100644
--- a/libavformat/mxfenc.c
+++ b/libavformat/mxfenc.c
@@ -1023,7 +1023,7 @@ static void mxf_write_generic_sound_common(AVFormatContext *s, AVStream *st, con
             av_log(s, AV_LOG_WARNING, "d10_channelcount shall be set to 4 or 8 : the output will not comply to MXF D-10 specs\n");
         avio_wb32(pb, mxf->channel_count);
     } else {
-        if (show_warnings)
+        if (show_warnings && mxf->channel_count != -1)
             av_log(s, AV_LOG_ERROR, "-d10_channelcount requires MXF D-10 and will be ignored\n");
         avio_wb32(pb, st->codec->channels);
     }



More information about the ffmpeg-cvslog mailing list