diff options
| author | James Almer <jamrial@gmail.com> | 2017-11-12 00:46:52 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-11-12 00:46:52 -0300 |
| commit | f5c67c431ef9d60deb6451d6499e10b9ad510335 (patch) | |
| tree | c94d264d85bea3a917d2b1e554ef84db9ab0f144 /libavformat/matroskadec.c | |
| parent | a629bc99fd111f9275c1e3b54dc358efeeae18d9 (diff) | |
| parent | 55fe72a841ba306370e68e86c88f34b4456aa4dd (diff) | |
| download | ffmpeg-f5c67c431ef9d60deb6451d6499e10b9ad510335.tar.gz | |
Merge commit '55fe72a841ba306370e68e86c88f34b4456aa4dd'
* commit '55fe72a841ba306370e68e86c88f34b4456aa4dd':
matroskadec: don't warn about unknown spherical medata when none is present
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavformat/matroskadec.c')
| -rw-r--r-- | libavformat/matroskadec.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index cdb2e20bb1..496499b553 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -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; } |