From patchwork Mon Apr 3 14:33:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthieu Bouron X-Patchwork-Id: 3264 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.44.195 with SMTP id s186csp63056vss; Mon, 3 Apr 2017 05:41:01 -0700 (PDT) X-Received: by 10.28.127.15 with SMTP id a15mr9277358wmd.115.1491223261341; Mon, 03 Apr 2017 05:41:01 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id i79si15097658wme.61.2017.04.03.05.41.00; Mon, 03 Apr 2017 05:41:01 -0700 (PDT) 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; 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 4BF43688389; Mon, 3 Apr 2017 15:40:53 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f193.google.com (mail-wr0-f193.google.com [209.85.128.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8BF4B688381 for ; Mon, 3 Apr 2017 15:40:47 +0300 (EEST) Received: by mail-wr0-f193.google.com with SMTP id k6so31932857wre.3 for ; Mon, 03 Apr 2017 05:40:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=cRj3olpknanjeKe1rYOPFfaUa0t0b1ybGyX3OjdiEao=; b=JF2gVE8QC4zLOBloLFgQlv6SkzKsTXSkufhsjuaSShM85lVJWS2C/j80kWbJyRZbWp o9ERBiOSEWIOf9URfByEkuyZBd1c1rc6rGINo4k+xX1DSEeqbnlTn97Ixb7Km8G6z3PC k3FrS4/GLGs10zPMybT7AHni/bek/CJwCC7yCutB2JvBOYod9igBSk+4UJb+bAVMdcjU 2PtsNT76J5DXL9x4qGP++EEW3Og+r4Bept0C2OyzOt6l1jAisa6h48em1RTQ/ZmQFS8x CrRvkZsDGo/Bm8tRiNi8YxjyPkq+7HRLP0Hl6+R0D2plC+NRRe08gJOzjmzbBw9U8XIG CqPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=cRj3olpknanjeKe1rYOPFfaUa0t0b1ybGyX3OjdiEao=; b=ogW9Lbq9SFi5LleuuhcBvGGdevfOPXb+PlGq+uz8i8w+9L4CdTg8B8XLwuLBjmEwnF 7mPjVoInSYlY+xsPYUux86eriMP1pwhs57PHAbigS1thuD2RDu2DAIzXeeiLkEeONbUg jOhhD0HbQ5Pm5LKpBnlVNYuz2PU0+8IofXI946kK5/cGP8QmVyfSUxWMf6v+4hAomAjs GptfaQzFHhk2Q+KUHjEaRquVhIHUQfJWPeRD/V2QT2ox9db+f6vAI5XWxSS9gnWh3sp0 Jj7Bcockv4DKmuCsEN0Icws1nWQ5Koh2eHrcdi/9X+jX36Q0bRQtxOMlMAJSWTREuVGd kiVw== X-Gm-Message-State: AFeK/H0OHLmEwIAuE8OY5xb0lKYl/O5zOv+fgCPKNfmpUg3VjJ7cqO7JfXJ0iw+2xPKg5A== X-Received: by 10.223.146.132 with SMTP id 4mr13991007wrn.91.1491222828523; Mon, 03 Apr 2017 05:33:48 -0700 (PDT) Received: from boken.gopro.lcl (LPuteaux-656-1-74-135.w80-12.abo.wanadoo.fr. [80.12.80.135]) by smtp.gmail.com with ESMTPSA id o22sm3183438wro.45.2017.04.03.05.33.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 03 Apr 2017 05:33:47 -0700 (PDT) From: Matthieu Bouron To: ffmpeg-devel@ffmpeg.org Date: Mon, 3 Apr 2017 16:33:57 +0200 Message-Id: <20170403143357.10803-3-matthieu.bouron@gmail.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170403143357.10803-1-matthieu.bouron@gmail.com> References: <20170403143357.10803-1-matthieu.bouron@gmail.com> Subject: [FFmpeg-devel] [PATCH 3/3] doc/examples/extract_mvs: re-indent after previous commit 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: Matthieu Bouron MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- doc/examples/extract_mvs.c | 56 +++++++++++++++++++++++----------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/doc/examples/extract_mvs.c b/doc/examples/extract_mvs.c index 552a7334cf..7ae934ead3 100644 --- a/doc/examples/extract_mvs.c +++ b/doc/examples/extract_mvs.c @@ -35,40 +35,40 @@ static int video_frame_count = 0; static int decode_packet(const AVPacket *pkt) { - int ret = avcodec_send_packet(video_dec_ctx, pkt); - if (ret < 0) { - fprintf(stderr, "Error while sending a packet to the decoder: %s\n", av_err2str(ret)); + int ret = avcodec_send_packet(video_dec_ctx, pkt); + if (ret < 0) { + fprintf(stderr, "Error while sending a packet to the decoder: %s\n", av_err2str(ret)); + return ret; + } + + while (ret >= 0) { + ret = avcodec_receive_frame(video_dec_ctx, frame); + if (ret == AVERROR(EAGAIN) || ret == AVERROR_EOF) { + break; + } else if (ret < 0) { + fprintf(stderr, "Error while receiving a frame from the decoder: %s\n", av_err2str(ret)); return ret; } - while (ret >= 0) { - ret = avcodec_receive_frame(video_dec_ctx, frame); - if (ret == AVERROR(EAGAIN) || ret == AVERROR_EOF) { - break; - } else if (ret < 0) { - fprintf(stderr, "Error while receiving a frame from the decoder: %s\n", av_err2str(ret)); - return ret; - } - - if (ret >= 0) { - int i; - AVFrameSideData *sd; - - video_frame_count++; - sd = av_frame_get_side_data(frame, AV_FRAME_DATA_MOTION_VECTORS); - if (sd) { - const AVMotionVector *mvs = (const AVMotionVector *)sd->data; - for (i = 0; i < sd->size / sizeof(*mvs); i++) { - const AVMotionVector *mv = &mvs[i]; - printf("%d,%2d,%2d,%2d,%4d,%4d,%4d,%4d,0x%"PRIx64"\n", - video_frame_count, mv->source, - mv->w, mv->h, mv->src_x, mv->src_y, - mv->dst_x, mv->dst_y, mv->flags); - } + if (ret >= 0) { + int i; + AVFrameSideData *sd; + + video_frame_count++; + sd = av_frame_get_side_data(frame, AV_FRAME_DATA_MOTION_VECTORS); + if (sd) { + const AVMotionVector *mvs = (const AVMotionVector *)sd->data; + for (i = 0; i < sd->size / sizeof(*mvs); i++) { + const AVMotionVector *mv = &mvs[i]; + printf("%d,%2d,%2d,%2d,%4d,%4d,%4d,%4d,0x%"PRIx64"\n", + video_frame_count, mv->source, + mv->w, mv->h, mv->src_x, mv->src_y, + mv->dst_x, mv->dst_y, mv->flags); } - av_frame_unref(frame); } + av_frame_unref(frame); } + } return 0; }