aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2016-10-08 11:23:41 +0200
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2016-10-11 09:45:37 +0200
commitd0c1b9821aa1c6b8efd27e022ee4aefe9fc989b0 (patch)
treebd315f5b710491a0990c62f1b1a0d9ca03a51d16 /libavformat
parentc44eae157f62b6792bbf8403f937658cb9d12621 (diff)
downloadffmpeg-d0c1b9821aa1c6b8efd27e022ee4aefe9fc989b0.tar.gz
lavf/mxfenc: Do not print a useless error message.
The option d10_channelcount only exists for mxf_d10.
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/mxfenc.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c
index 7733ef8077..afea117d5a 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);
}