aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEran Kornblau <eran.kornblau@kaltura.com>2016-02-04 15:31:25 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2016-02-05 01:11:04 +0100
commit1bbfaba196b373496de59b8799849b5eadc3193b (patch)
tree7b709f135716f9a6751313c3be9c737fd44891a8
parent1693336aed3988e0c13ad1ff880257d80d6ae69d (diff)
downloadffmpeg-1bbfaba196b373496de59b8799849b5eadc3193b.tar.gz
avformat/mov: dont print frma warning when format is the same
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavformat/mov.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c
index e2f107ff07..944bd86443 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -4005,9 +4005,11 @@ static int mov_read_frma(MOVContext *c, AVIOContext *pb, MOVAtom atom)
break;
default:
- av_log(c->fc, AV_LOG_WARNING,
- "ignoring 'frma' atom of '%.4s', stream format is '%.4s'\n",
- (char*)&format, (char*)&sc->format);
+ if (format != sc->format) {
+ av_log(c->fc, AV_LOG_WARNING,
+ "ignoring 'frma' atom of '%.4s', stream format is '%.4s'\n",
+ (char*)&format, (char*)&sc->format);
+ }
break;
}