From patchwork Fri Jan 5 04:43:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Eugen Hoyos X-Patchwork-Id: 7134 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.78.2 with SMTP id r2csp317551jaa; Thu, 4 Jan 2018 20:43:32 -0800 (PST) X-Google-Smtp-Source: ACJfBouxn3jRjf+oiorJszkwzEsL8maEagcCQH3FH3Sg1bawq1wNa7nwr+0h6CGeE9RXvSqpXY9p X-Received: by 10.223.184.195 with SMTP id c3mr1656461wrg.9.1515127412132; Thu, 04 Jan 2018 20:43:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515127412; cv=none; d=google.com; s=arc-20160816; b=OPeG/CR0X9cJMaFP/mn9mOkEvBzL4hLDSMWkkAUeADeospoUH1xDXRrrJ1loJMNRT6 uN8vCwwCgWlfSDsxRd2KEVXJ2W/F/bCnH0FdPe+h3hl2KGXcbIxFRugA++i22oHQnLx8 6XIN+fDVof3pvYrtBc+S9TcRa19zzuO7MhhKA2RU82NVL6mNadoCROSb2MBPd106vdim EjABDfm7Qv5RRDeueuadWAhfqkngCxre8+nw5YtWdw5geTlCw2ddnhUVzhpng9vRCbmN eWBf1DAePhPHRk40Q1jIORsAZo+XcVkg34U5WzWLvkPyWgL7V4dB3s89dKKx72HU5cqL 0bzg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject:to :message-id:date:from:mime-version:dkim-signature:delivered-to :arc-authentication-results; bh=Gew6AshZRfKDk3RnIaZ6v/KmuywBLFpkyrZgc+zysNA=; b=AzFgAgR+dGJXT7SM5NBzxaW05Vh1C5MQ66q3lpKYbEkXB3GW99+9h+cxtXrEY0HtKN QlADaxm01S0pVU/JsqslUEDSC5TTnqb17e+kpbKziD+DIRAlp7Na9Yu3Bv0f5VEwEZ21 CRsS23Zy4zFmUZOR5AENwQc6ofPfXJrtet9cx2t4tZ5pByi+71ncf4Fx8YoLn7XmXn0G yYKPbYHNOvm4k28LRe7PQR7jjWSk3B7pnMOgOijeFTu7hHBiJuxOqwk9HaML+515f4WQ U0GrLuLYLu4yPx9yIRFIOU8/I/GY5jeokp71VNWgfUA5lJHSwYxXhxFci3u+1BKvJ4zG jbaQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=MTFzKClC; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id g194si3078342wmg.203.2018.01.04.20.43.30; Thu, 04 Jan 2018 20:43:32 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=MTFzKClC; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 76918689811; Fri, 5 Jan 2018 06:43:12 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-it0-f51.google.com (mail-it0-f51.google.com [209.85.214.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6F5D36891DE for ; Fri, 5 Jan 2018 06:43:06 +0200 (EET) Received: by mail-it0-f51.google.com with SMTP id o130so3474813itg.0 for ; Thu, 04 Jan 2018 20:43:23 -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=oKK1NMTIGwGeFbk4hPA02MjLy1rzCP/MpU9g3RUQb9o=; b=MTFzKClCrnaRQWp44cNkjDbCkUOudkpijN1WRv8r3pQ0yUS45h/UxWQoOhjNIcfrAo k0WcoXbnISu2QDECGnlU+IsrN6VZgbUPJYGZsSQpq4Q3axUqfAsVwpoJJSFFadFsLEhA cGkkqAb6IC0RKwRgQsN6XjrAJ/Ms9MHCf2OGsXnQKwosaAD+5ImAeWIGDRhdTRWsX6aw MgLaR9NGatFjKW3TOu5DXogET80g9k+GtbMlNrFhaKohnZDxVonSaRO8h2/PIwgqqX6y GqKDIr3c+x7ZqAhkUMwMzZ13VE8Wbmetr9gcdcA93FyWt2cpaaZaEcaHOWdbImziMCPw ISUA== 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=oKK1NMTIGwGeFbk4hPA02MjLy1rzCP/MpU9g3RUQb9o=; b=X8NQMArzXljBIepwzMw9kxCOa7yb/JlKlD6zk9Fm6U+YzB2DTvyyTHpANycbs/XAPR L99PNVT/FGKNQsmQi4SiavPpT9OQCfnvqyJ2GE9MN5qJq5f6QBR/VEFfdU0ndr/vzWBG e70rrXiP2ojFgudN37Nc22FEJvbnxD7tBOhhQ7IAf8isdup4rLR+hb0lvgKmQuyPiuVR LI88S+7ccSs3WAtbvme9FZfBO/iWTsRkDdmxQzG5bz20IAIs/6O/+9G6SMlLcjPlHw4K cIEMS/OhImF/pUcy8muOxNeQKNX+NtWI7/i4VMhq0zFkP5KoyA8iBdaCIu3V45pFumVx JW8g== X-Gm-Message-State: AKGB3mLsUKJbYiERYzh5b97sBrEPIlC0UO1UH1JJoPZw5k5BC2iezHYQ IU3x0ku5nkRzP1g/xNiUxpR0j5WnXub7DQ8mckg= X-Received: by 10.36.3.209 with SMTP id e200mr2023923ite.113.1515127402161; Thu, 04 Jan 2018 20:43:22 -0800 (PST) MIME-Version: 1.0 Received: by 10.2.119.211 with HTTP; Thu, 4 Jan 2018 20:43:01 -0800 (PST) From: Carl Eugen Hoyos Date: Fri, 5 Jan 2018 05:43:01 +0100 Message-ID: To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH]lavf/rtpdec_jpeg: Treat stream type 64 like 0. 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 intends to fix ticket #5975, rfc 2435 says stream type 64 should be treated like 0. Please review, Carl Eugen From 690f2fccf766f3cbb23a1ef45e235e25c355b197 Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Fri, 5 Jan 2018 05:40:30 +0100 Subject: [PATCH] lavf/rtpdec_jpeg: Treat jpeg type 64 like 0. Fixes ticket #5975. --- libavformat/rtpdec_jpeg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/rtpdec_jpeg.c b/libavformat/rtpdec_jpeg.c index 465d9bc..3a33e3a 100644 --- a/libavformat/rtpdec_jpeg.c +++ b/libavformat/rtpdec_jpeg.c @@ -162,7 +162,7 @@ static int jpeg_create_header(uint8_t *buf, int size, uint32_t type, uint32_t w, bytestream2_put_be16(&pbc, w); bytestream2_put_byte(&pbc, 3); /* number of components */ bytestream2_put_byte(&pbc, 1); /* component number */ - bytestream2_put_byte(&pbc, (2 << 4) | (type ? 2 : 1)); /* hsample/vsample */ + bytestream2_put_byte(&pbc, (2 << 4) | (type & ~64 ? 2 : 1)); /* hsample/vsample */ bytestream2_put_byte(&pbc, 0); /* matrix number */ bytestream2_put_byte(&pbc, 2); /* component number */ bytestream2_put_byte(&pbc, 1 << 4 | 1); /* hsample/vsample */ -- 1.7.10.4