From patchwork Fri Jul 21 12:26:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jorge Ramirez-Ortiz X-Patchwork-Id: 4415 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.1.76 with SMTP id 73csp864449vsb; Fri, 21 Jul 2017 05:32:01 -0700 (PDT) X-Received: by 10.28.92.207 with SMTP id q198mr4763499wmb.72.1500640321197; Fri, 21 Jul 2017 05:32:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500640321; cv=none; d=google.com; s=arc-20160816; b=LBdddiPYXAiEXrNkmMqg/ae0/m2iL0pbJTOyrpS+JtJEawGzYqjjCOKSttF6SKRmTA 1mVWn08DkGZaY8RcAZCRyMyHD9y3LvuisRVONa3T418nbgLA2wlMQH1PhV2rU3nYa2Rb kI+kW2DiS1Bw1RbfU4sMEQ2yT+uVPyrhsLEqGk8a6vq3LG22GWSPZXbGIq0fs8ia21z3 poG56IpZWoy1PD7ldLJNvMM2NYY8vZLR6EmUi5jYjK7P8hVJ2YyBsK+8kf/uS1OEJcNS wAmC91cbjwPbv+zz+Nej13lTrgStHlIA/djBOp9ryG6m5s3yaDulgyG2okincIPy+9sk p7sw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=DNU999uAxTeKg3AbuglgXnhQK1xrxZoIDtH7hXJ4Gsw=; b=lDqDW2x5Y/7Op79+li7r9Z2ReLxfaGmvW+TXKF3Hk9qID+8F2Yvny9i5EW63Tk4Hgo nT521xyxKfG3mbhWHZqhLYnaWj8ijcXjeTww+xNRY6gcRpbOFZTWChA9ZIIH2+/fK+nY jYFDat5fv8YesCbdOZk/0epsu0MNK/bz5cXIi6XOJ2Nl4MyK9RutxkWBXnRZC4tySfKu DLVucOqatIAyVg7eMQdD5bkRHkJWUicZjjGbbQzq/obMrayQ4b/y4rXXAko/uoAek9zb TiIQwuZS0oDVr+qebe8UK8bWK6OMepS+PGqovIuA34RukO8P8sV02wcKdtycXKhueLos bUEw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=LXXzbD3v; 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=linaro.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id l82si967377wmb.156.2017.07.21.05.32.00; Fri, 21 Jul 2017 05:32: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=@linaro.org header.s=google header.b=LXXzbD3v; 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=linaro.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E0DD6689C98; Fri, 21 Jul 2017 15:31:49 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f171.google.com (mail-wr0-f171.google.com [209.85.128.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 54D66689A5C for ; Fri, 21 Jul 2017 15:31:44 +0300 (EEST) Received: by mail-wr0-f171.google.com with SMTP id f21so25418222wrf.5 for ; Fri, 21 Jul 2017 05:31:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id; bh=Ziqu7TDnRY0g5CdW9801r3FsNA8QiYCjsVu0wJm+W9g=; b=LXXzbD3vYv+TG+5tIPJCtgUCx/JVek9LrAUOLZuRozv5P6sR2hu5ZwYuMcScoUDE8N 9pXm0geoDDivrvz2bcRsiAy2GbZGaFuaOQWjvJwkMCGDf5iHCYdcIgqlVrRE7MWsNbCb NMAcS5c4WyALo8GITCDwkjZShtigws2cad7WQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=Ziqu7TDnRY0g5CdW9801r3FsNA8QiYCjsVu0wJm+W9g=; b=PxnO22XQAg8kdnIhkg5tEXvVXVvDHoc5TgafHPR+k+r6v1OR0ShR2r6DMJR6xBlgr0 2c9vpO6y1Xh0P1BjqGIhcQoCwMMJOkHM3JuBO9vDDylcGk9JSVsOhgGrJNHfl4NQ/7I0 AoTz6GoraESuCuYZaDLL8BBY/Kn2JAezpPf7xf5HsFIO9lWuR93X2h+xVHQTp+EXqbsn T6BOIC/m0AS4OCbKyon1C4gy4x+ihTnWTmX0Y24C39CwyRMUakorMzY326NbnZ7aB8Jf j9/xGx5w0W0ipehCaLm4q95T7gj9Ov8v17BbgGvXBG4VSZTFmgoPME0gwdVpH+79mLz7 fHYQ== X-Gm-Message-State: AIVw111sRYnD/yEyV/g/XrDghGr/GPhWwuR6xSgUf7hQm+T8JHnn/Ga9 jviBx0n5TsTZCcTi X-Received: by 10.223.150.208 with SMTP id u74mr5744279wrb.259.1500639970252; Fri, 21 Jul 2017 05:26:10 -0700 (PDT) Received: from igloo.80.58.61.254 (40.red-79-144-71.dynamicip.rima-tde.net. [79.144.71.40]) by smtp.gmail.com with ESMTPSA id 32sm10758210wry.31.2017.07.21.05.26.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 21 Jul 2017 05:26:09 -0700 (PDT) From: Jorge Ramirez-Ortiz To: jorge.ramirez-ortiz@linaro.org, ffmpeg-devel@ffmpeg.org, cus@passwd.hu Date: Fri, 21 Jul 2017 14:26:03 +0200 Message-Id: <1500639963-9838-1-git-send-email-jorge.ramirez-ortiz@linaro.org> X-Mailer: git-send-email 2.7.4 Subject: [FFmpeg-devel] [PATCH] ffplay: terminate program on EOF. 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" ffplay always requires user intervention via the GUI to close the video at the end of the file. This commit, stops playing and terminates the program when EOF is received. --- ffplay.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/ffplay.c b/ffplay.c index c0b326c..12de7ba 100644 --- a/ffplay.c +++ b/ffplay.c @@ -593,7 +593,7 @@ static int decoder_decode_frame(Decoder *d, AVFrame *frame, AVSubtitle *sub) { if (ret == AVERROR_EOF) { d->finished = d->pkt_serial; avcodec_flush_buffers(d->avctx); - return 0; + return -1; } if (ret >= 0) return 1; @@ -2088,8 +2088,13 @@ static int video_thread(void *arg) for (;;) { ret = get_video_frame(is, frame); - if (ret < 0) - goto the_end; + if (ret < 0) { + SDL_Event event; + event.type = FF_QUIT_EVENT; + event.user.data1 = is; + SDL_PushEvent(&event); + goto the_end; + } if (!ret) continue;