From patchwork Sat Dec 10 15:49:08 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Eugen Hoyos X-Patchwork-Id: 1743 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.65.86 with SMTP id o83csp880755vsa; Sat, 10 Dec 2016 07:49:19 -0800 (PST) X-Received: by 10.194.96.135 with SMTP id ds7mr73964663wjb.29.1481384959770; Sat, 10 Dec 2016 07:49:19 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id dp20si38326287wjb.2.2016.12.10.07.49.19; Sat, 10 Dec 2016 07:49:19 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6418468A061; Sat, 10 Dec 2016 17:49:13 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe04-2.mx.upcmail.net (vie01a-dmta-pe04-2.mx.upcmail.net [62.179.121.164]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7BF44689E29 for ; Sat, 10 Dec 2016 17:49:07 +0200 (EET) Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe04.mx.upcmail.net with esmtp (Exim 4.87) (envelope-from ) id 1cFjtd-0003wF-SY for ffmpeg-devel@ffmpeg.org; Sat, 10 Dec 2016 16:49:09 +0100 Received: from [192.168.0.11] ([80.110.108.27]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id JFp81u00c0bW32g01Fp97N; Sat, 10 Dec 2016 16:49:09 +0100 X-SourceIP: 80.110.108.27 From: Carl Eugen Hoyos To: FFmpeg development discussions and patches Date: Sat, 10 Dec 2016 16:49:08 +0100 User-Agent: KMail/1.9.10 MIME-Version: 1.0 Message-Id: <201612101649.08476.cehoyos@ag.or.at> Subject: [FFmpeg-devel] [PATCH]lavd/v4l2: Do not set frame_set to a negative value 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 a minor bug, displaying a negative bitrate. Please comment, Carl Eugen From e2e4999c9e91fb2f6bcc782fdfe7a2f5d73d7600 Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Sat, 10 Dec 2016 16:43:00 +0100 Subject: [PATCH] lavd/v4l2: Avoid setting frame_size to a negative value. --- libavdevice/v4l2.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c index ae51d83..b57909bd 100644 --- a/libavdevice/v4l2.c +++ b/libavdevice/v4l2.c @@ -936,6 +936,7 @@ static int v4l2_read_header(AVFormatContext *ctx) goto fail; st->codecpar->format = ff_fmt_v4l2ff(desired_format, codec_id); + if (st->codecpar->format != AV_PIX_FMT_NONE) s->frame_size = av_image_get_buffer_size(st->codecpar->format, s->width, s->height, 1);