diff mbox

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

Message ID 201610081128.18742.cehoyos@ag.or.at
State Accepted
Commit d0c1b9821aa1c6b8efd27e022ee4aefe9fc989b0
Headers show

Commit Message

Carl Eugen Hoyos Oct. 8, 2016, 9:28 a.m. UTC
Hi!

Attached patch removes a warning that is always shown if the 
default mxf muxer is used.

Please comment, Carl Eugen
From 07718cad8cefbafd18355f91b9548118308c42bd Mon Sep 17 00:00:00 2001
From: Carl Eugen Hoyos <cehoyos@ag.or.at>
Date: Sat, 8 Oct 2016 11:23:41 +0200
Subject: [PATCH] lavf/mxfenc: Do not print a useless error message.

The option d10_channelcount only exists for mxf_d10.
---
 libavformat/mxfenc.c |    2 --
 1 file changed, 2 deletions(-)

Comments

Carl Eugen Hoyos Oct. 11, 2016, 7:46 a.m. UTC | #1
2016-10-08 11:28 GMT+02:00 Carl Eugen Hoyos <cehoyos@ag.or.at>:

> Attached patch removes a warning that is always shown if the
> default mxf muxer is used.

Patch applied.

Carl Eugen
diff mbox

Patch

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);
     }