[FFmpeg-cvslog] avformat/mov: Fix endian-dependent parsing

Andreas Rheinhardt git at videolan.org
Fri Jan 21 12:53:29 EET 2022


ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at outlook.com> | Fri Jan 21 10:53:17 2022 +0100| [c8b11b28d1eb8dfa34c727c5da9b266124196799] | committer: Andreas Rheinhardt

avformat/mov: Fix endian-dependent parsing

MOVAtom.type is always read as a little-endian number
(despite MOV/ISOBMFF being big-endian).
Fixes the matroska-dovi-write-config8 FATE-test on big-endian
arches (which runs into the "index out of range" warning message).

Reviewed-by: Martin Storsjö <martin at martin.st>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>

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

 libavformat/mov.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/mov.c b/libavformat/mov.c
index e401cd39b5..1437d160f8 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -407,7 +407,7 @@ retry:
             atom.size -= 16;
 
             if (!key && c->found_hdlr_mdta && c->meta_keys) {
-                uint32_t index = AV_RB32(&atom.type);
+                uint32_t index = av_bswap32(atom.type); // BE number has been read as LE
                 if (index < c->meta_keys_count && index > 0) {
                     key = c->meta_keys[index];
                 } else if (atom.type != MKTAG('c', 'o', 'v', 'r')) {



More information about the ffmpeg-cvslog mailing list