1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00

Merge commit '55fe72a841ba306370e68e86c88f34b4456aa4dd'

* commit '55fe72a841ba306370e68e86c88f34b4456aa4dd':
  matroskadec: don't warn about unknown spherical medata when none is present

Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2017-11-12 00:46:52 -03:00
commit f5c67c431e

View File

@ -1989,7 +1989,13 @@ static int mkv_parse_video_projection(AVStream *st, const MatroskaTrack *track)
return AVERROR_INVALIDDATA;
}
break;
case MATROSKA_VIDEO_PROJECTION_TYPE_RECTANGULAR:
/* No Spherical metadata */
return 0;
default:
av_log(NULL, AV_LOG_WARNING,
"Unknown spherical metadata type %"PRIu64"\n",
track->video.projection.type);
return 0;
}