Merge commit '55fe72a841ba306370e68e86c88f34b4456aa4dd'
authorJames Almer <jamrial@gmail.com>
Sun, 12 Nov 2017 03:46:52 +0000 (00:46 -0300)
committerJames Almer <jamrial@gmail.com>
Sun, 12 Nov 2017 03:46:52 +0000 (00:46 -0300)
* commit '55fe72a841ba306370e68e86c88f34b4456aa4dd':
  matroskadec: don't warn about unknown spherical medata when none is present

Merged-by: James Almer <jamrial@gmail.com>
libavformat/matroskadec.c

index cdb2e20..496499b 100644 (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;
     }