Commit ac8c72f8 authored by Vittorio Giovara's avatar Vittorio Giovara

mov: Fix checking layout and loading padding for cubemaps

parent 1afd2469
...@@ -4635,7 +4635,7 @@ static int mov_read_sv3d(MOVContext *c, AVIOContext *pb, MOVAtom atom) ...@@ -4635,7 +4635,7 @@ static int mov_read_sv3d(MOVContext *c, AVIOContext *pb, MOVAtom atom)
{ {
AVStream *st; AVStream *st;
MOVStreamContext *sc; MOVStreamContext *sc;
int size; int size, layout;
int32_t yaw, pitch, roll; int32_t yaw, pitch, roll;
size_t l = 0, t = 0, r = 0, b = 0; size_t l = 0, t = 0, r = 0, b = 0;
size_t padding = 0; size_t padding = 0;
...@@ -4699,6 +4699,12 @@ static int mov_read_sv3d(MOVContext *c, AVIOContext *pb, MOVAtom atom) ...@@ -4699,6 +4699,12 @@ static int mov_read_sv3d(MOVContext *c, AVIOContext *pb, MOVAtom atom)
avio_skip(pb, 4); /* version + flags */ avio_skip(pb, 4); /* version + flags */
switch (tag) { switch (tag) {
case MKTAG('c','b','m','p'): case MKTAG('c','b','m','p'):
layout = avio_rb32(pb);
if (layout) {
av_log(c->fc, AV_LOG_WARNING,
"Unsupported cubemap layout %d\n", layout);
return 0;
}
projection = AV_SPHERICAL_CUBEMAP; projection = AV_SPHERICAL_CUBEMAP;
padding = avio_rb32(pb); padding = avio_rb32(pb);
break; break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment