diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-22 22:36:55 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-27 02:13:50 +0200 |
commit | 9e8ab36f5419149bbaedd88fe0e25507d66a3c93 (patch) | |
tree | 10a72fce600d5e3f58e44cbc8eef1c6b71940618 | |
parent | 570397c7311554f47d36574107e3d27cd53ec406 (diff) | |
download | ffmpeg-9e8ab36f5419149bbaedd88fe0e25507d66a3c93.tar.gz |
avformat/mxfenc: dont warn about d10_channelcount being ignored if its not set
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r-- | libavformat/mxfenc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c index bba01158fa..6a6b7c2079 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); } |