[FFmpeg-cvslog] avformat/mov: dont print frma warning when format is the same
Eran Kornblau
git at videolan.org
Fri Feb 5 01:25:33 CET 2016
ffmpeg | branch: master | Eran Kornblau <eran.kornblau at kaltura.com> | Thu Feb 4 15:31:25 2016 +0200| [1bbfaba196b373496de59b8799849b5eadc3193b] | committer: Michael Niedermayer
avformat/mov: dont print frma warning when format is the same
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1bbfaba196b373496de59b8799849b5eadc3193b
---
libavformat/mov.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/libavformat/mov.c b/libavformat/mov.c
index e2f107f..944bd86 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;
}
More information about the ffmpeg-cvslog
mailing list