From patchwork Fri Dec 13 18:13:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Eugen Hoyos X-Patchwork-Id: 16776 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 726C244832E for ; Fri, 13 Dec 2019 20:13:40 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 51E6868ACE8; Fri, 13 Dec 2019 20:13:40 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io1-f48.google.com (mail-io1-f48.google.com [209.85.166.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E5C1868A101 for ; Fri, 13 Dec 2019 20:13:33 +0200 (EET) Received: by mail-io1-f48.google.com with SMTP id x1so552090iop.7 for ; Fri, 13 Dec 2019 10:13:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=/fdVgZUj4p4mX+zKXrrGxqlgLLsWyGGVv/T5Sz7+izw=; b=M1x3hbWR82VHtjYZH7uxlUvrMQEmGgdDli47SSvSUI9dTXcIjhfG697RK2JMeC9jyE AksYg5jzjY7vuRiIezJ+GeRWSDDM4e8gxRUMyOSdfgNUqtOgBLQ6CID1Cpug+XNL5hH7 x3c+RgDU1QP5sdrnjiiK4+acnqVIIM8/TXKqjgbi4lEa/G2kUqJQu9sq8Iicjenn5sVY V10tKH+KCDgbBV1uTChAydwAlHoWksiVcP2eDICC45L0Ft3w6hW9Y6yOElmoWvndvdVO 2HALQYEeGgFFYad0zf41THJhf4BQoCt4YhRAXpA0x3BAUbJnvwYJE86xZjQCZqL/4nF2 tLNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=/fdVgZUj4p4mX+zKXrrGxqlgLLsWyGGVv/T5Sz7+izw=; b=PJqvpnM+Ac0tvVj9jk/XfbU/XTdNlaJsSdr8FeXIz9BVe+5+gcoMvqNiy3f0zMJ4+h HYijGfsRj2TQGh/OREFB34n34opPbqLnFXFOOz+Bb7AhqTTpsMp72Cd5A/Un1eiZo+/z XArQ+9RjV0zwMPWKQZ0a0GyfTikT+DiUvOqlU5TzfJb+gdW9JrYVp5s8pRnm/y1ffDXG j2DUC6yU8fMBU6w3QcTT+swoBBgg1ulFOBoQMwht+U8uTC0KsniDXkTkqz9DKxolJ9jk U/TK7IxTgQ8oiQGCvKPSggcI6sBSY20TuwS75e0dCvnVaR/+hCK0otViOb/dnIlUBj6S 6shw== X-Gm-Message-State: APjAAAVDp8RDciirDhlKt3YzfZDeT5jCmnMcQs1UgVy+X/ga6IGj+inh 5QqIsjpq2LsdceLW7Y0R3XpiIMRm3JLOVTBVhn/odQ== X-Google-Smtp-Source: APXvYqwE9OnhIb8fOUKCXO1cfksjrMJoE3pjm4GNoozioeyfBGQ+sAUZ02yp6o9X3vtaL+4ixAaeLTuZcY3smb3ccXA= X-Received: by 2002:a5e:da42:: with SMTP id o2mr8273210iop.125.1576260812214; Fri, 13 Dec 2019 10:13:32 -0800 (PST) MIME-Version: 1.0 From: Carl Eugen Hoyos Date: Fri, 13 Dec 2019 19:13:20 +0100 Message-ID: To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH]lavc/pnmdec: Fix 16bit decoding 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Hi! Attached patch fixes decoding a sample provided on irc. Please comment, Carl Eugen From 9bf070aab1a88fb37db3c9322665edee9f90919f Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Fri, 13 Dec 2019 19:10:15 +0100 Subject: [PATCH] lavc/pnmdec: Fix 16bit decoding. Regression since cdb5479c Reported by irc user tTh from Mixart-Myrys --- libavcodec/pnmdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/pnmdec.c b/libavcodec/pnmdec.c index 958c5e43b0..dbcaef3884 100644 --- a/libavcodec/pnmdec.c +++ b/libavcodec/pnmdec.c @@ -143,7 +143,7 @@ static int pnm_decode_frame(AVCodecContext *avctx, void *data, v = (*s->bytestream++)&1; } else { /* read a sequence of digits */ - for (k = 0; k < 5 && c <= 9; k += 1) { + for (k = 0; k < 6 && c <= 9; k += 1) { v = 10*v + c; c = (*s->bytestream++) - '0'; } -- 2.23.0