Imported Debian version 2.5.0~trusty1.1

[deb_ffmpeg.git] / ffmpeg / libavcodec / g2meet.c

diff --git a/ffmpeg/libavcodec/g2meet.c b/ffmpeg/libavcodec/g2meet.c
index d0cb88cb56ab83a9b46058d14eb68682840041c9..0cd502bc08f03ea04fc10228c6a053d71d67156c 100644 (file)
--- a/ffmpeg/libavcodec/g2meet.c
+++ b/ffmpeg/libavcodec/g2meet.c
@@ -683,12 +683,12 @@ static int g2m_decode_frame(AVCodecContext *avctx, void *data,
 
     magic = bytestream2_get_be32(&bc);
     if ((magic & ~0xF) != MKBETAG('G', '2', 'M', '0') ||
-        (magic & 0xF) < 2 || (magic & 0xF) > 4) {
+        (magic & 0xF) < 2 || (magic & 0xF) > 5) {
         av_log(avctx, AV_LOG_ERROR, "Wrong magic %08X\n", magic);
         return AVERROR_INVALIDDATA;
     }
 
-    if ((magic & 0xF) != 4) {
+    if ((magic & 0xF) < 4) {
         av_log(avctx, AV_LOG_ERROR, "G2M2 and G2M3 are not yet supported\n");
         return AVERROR(ENOSYS);
     }