From patchwork Sun May 10 16:09:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean-Baptiste Kempf X-Patchwork-Id: 19600 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 5A85344BC3B for ; Sun, 10 May 2020 19:10:05 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 375FD6881EF; Sun, 10 May 2020 19:10:05 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 83066687F6A for ; Sun, 10 May 2020 19:09:58 +0300 (EEST) Received: by mail-wm1-f42.google.com with SMTP id k12so15292644wmj.3 for ; Sun, 10 May 2020 09:09:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=LUODqiirQpwHc/03LTp/8Vd7HlleqKhUdyAuglecLAE=; b=qbK7Wn4HzC3N+YEEpeDm4tHs9cp7hnTyWKWjARxmcAp6TEeiQMI5pUdSzypD70TTiD rUppQX27QsXpigRm8G0nq17qgK8SputQOgTRrNY7qc55uRxroKT0OvXtka4dN66oTota h6PBfdcVg2sFgDWUzqNQjq8Xk+sP7kttcT6eCC/2gvMAosmDGqlO+RQdF0bOZno+A08P 8NHacB0iUYIQ5ilL6hGSjfcPzFsBP9iOqYzRu/JaUg7y0kt4UbveXMIP0dNGo0orFsdV 4PCORP+67xWEfOP1Y4eZlNJM50pzCZD09YUZcKBfaliRMDo1Uagsi4yORcGRU6LICfg5 3mxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; bh=LUODqiirQpwHc/03LTp/8Vd7HlleqKhUdyAuglecLAE=; b=PgdT8O9QUQVyR1f2yFmpTxVptIvrtdFEPsivlAe87o9UYVumNv55jscPhqcBagcW5B zcw+AfzxHWlIA064XyB/7jquxcqOdFvJ2NEkMFzpxASo5FvbgOjfX3n8PkezxJZejwzn +PQ3vxUvrXY3PSXk0y3ySDgAMUysC/GGav9ewPHhqeDu59k+wUjDDgSxt9brumNMRZzG 1KIA6NiuX/dfxo8FbIUQs4LY1G/zNV10giTuDZ70KYMOw/i22nobCs4kXCbpU5hRrOVu XR89hq3cOiQh4NdRP0P6CeTQICm9gFzMyLyXorDgpeZcebYkpRwA9xwcsiAtsyDJaxAG vUiQ== X-Gm-Message-State: AGi0Pub2wKlRYZEX71uFv6he1X9u8iI6TfNzlZoWfmTA+WsK5eSGikPq SKWD11KTlxZqLDBtIeLFutDgKrJb6H0= X-Google-Smtp-Source: APiQypKsagLvhFGhFmCl1SMq2f80S8WZtTYFbi4aFOMH0XbH61r1CjK2PbHL8LGIpRcSyJE4CzXOSg== X-Received: by 2002:a7b:cc06:: with SMTP id f6mr15536777wmh.119.1589126997482; Sun, 10 May 2020 09:09:57 -0700 (PDT) Received: from localhost.localdomain (241.171.68.86.rev.sfr.net. [86.68.171.241]) by smtp.gmail.com with ESMTPSA id g15sm13480566wrp.96.2020.05.10.09.09.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 10 May 2020 09:09:56 -0700 (PDT) From: Jean-Baptiste Kempf To: ffmpeg-devel@ffmpeg.org Date: Sun, 10 May 2020 18:09:51 +0200 Message-Id: <20200510160951.88091-1-jb@videolan.org> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] Speedhq: Decode field 2 correctly X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Jean-Baptiste Kempf Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" This is similar to field 1 (effd2e72) --- libavcodec/speedhq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/speedhq.c b/libavcodec/speedhq.c index 890b8253cd..b834b79f28 100644 --- a/libavcodec/speedhq.c +++ b/libavcodec/speedhq.c @@ -447,7 +447,7 @@ static int speedhq_decode_frame(AVCodecContext *avctx, } frame->key_frame = 1; - if (second_field_offset == 4) { + if (second_field_offset == 4 || second_field_offset == (buf_size-4)) { /* * Overlapping first and second fields is used to signal * encoding only a single field. In this case, "height"