[FFmpeg-cvslog] mov: Fix identity matrix boolean logic

Vittorio Giovara git at videolan.org
Sat Apr 1 13:00:06 EEST 2017


ffmpeg | branch: master | Vittorio Giovara <vittorio.giovara at gmail.com> | Tue Nov 15 10:14:30 2016 -0500| [d5d62ce6d643de704e7bd62a2375e6391c0ffb9a] | committer: Vittorio Giovara

mov: Fix identity matrix boolean logic

This prevented the code from correctly exporting the rotation matrix
which caused a few samples to be displayed wrong.
Introduced in ecd2ec69ce10e13f6ede353d2def7c.

Signed-off-by: Vittorio Giovara <vittorio.giovara at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d5d62ce6d643de704e7bd62a2375e6391c0ffb9a
---

 libavformat/mov.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavformat/mov.c b/libavformat/mov.c
index b5b2a5b..df29f2a 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -2759,8 +2759,8 @@ static int mov_read_meta(MOVContext *c, AVIOContext *pb, MOVAtom atom)
     ( (matrix)[0][0] == (1 << 16) &&       \
       (matrix)[1][1] == (1 << 16) &&       \
       (matrix)[2][2] == (1 << 30) &&       \
-     !(matrix)[0][1] && !(matrix)[0][2] || \
-     !(matrix)[1][0] && !(matrix)[1][2] || \
+     !(matrix)[0][1] && !(matrix)[0][2] && \
+     !(matrix)[1][0] && !(matrix)[1][2] && \
      !(matrix)[2][0] && !(matrix)[2][1])
 
 static int mov_read_tkhd(MOVContext *c, AVIOContext *pb, MOVAtom atom)



More information about the ffmpeg-cvslog mailing list