[FFmpeg-cvslog] lavf/mxfenc: Do not print a useless error message.

Carl Eugen Hoyos git at videolan.org
Tue Oct 11 10:45:59 EEST 2016


ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Sat Oct  8 11:23:41 2016 +0200| [d0c1b9821aa1c6b8efd27e022ee4aefe9fc989b0] | committer: Carl Eugen Hoyos

lavf/mxfenc: Do not print a useless error message.

The option d10_channelcount only exists for mxf_d10.

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

 libavformat/mxfenc.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c
index 7733ef8..afea117 100644
--- a/libavformat/mxfenc.c
+++ b/libavformat/mxfenc.c
@@ -1169,8 +1169,6 @@ 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 && mxf->channel_count != -1 && s->oformat != &ff_mxf_opatom_muxer)
-            av_log(s, AV_LOG_ERROR, "-d10_channelcount requires MXF D-10 and will be ignored\n");
         avio_wb32(pb, st->codecpar->channels);
     }
 



More information about the ffmpeg-cvslog mailing list