[FFmpeg-cvslog] Merge commit '55fe72a841ba306370e68e86c88f34b4456aa4dd'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Sun Nov 12 00:46:52 2017 -0300| [f5c67c431ef9d60deb6451d6499e10b9ad510335] | committer: James Almer

Merge commit '55fe72a841ba306370e68e86c88f34b4456aa4dd'

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

Merged-by: James Almer <jamrial at gmail.com>

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

 libavformat/matroskadec.c | 6 ++++++
 1 file changed, 6 insertions(+)

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;
     }
 


======================================================================