From patchwork Thu Oct 26 20:54:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Eugen Hoyos X-Patchwork-Id: 5706 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.90 with SMTP id m26csp1252753jah; Thu, 26 Oct 2017 13:54:41 -0700 (PDT) X-Google-Smtp-Source: ABhQp+SbGsZa2jglnacZZLMWEtFkGRrNhRCqM+qVVd6T2vFhyGnq7o3WZ8odgWwViqLNIy0EzvFo X-Received: by 10.223.153.45 with SMTP id x42mr6382050wrb.212.1509051281000; Thu, 26 Oct 2017 13:54:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1509051280; cv=none; d=google.com; s=arc-20160816; b=hqjmL8ZAQjVdCeoF18ULkCmpK/8zLTUofY+rfbOednBgisY+fyLaYWup0NqU15m9SM lM0ARhJavksZ7Km4nlWR0YzzA7eYZkSgPc9LVV0487UHLZvNO7XaxmCj6weczZVMHWLL Hq/N6Ht5Irh2rnLrj6OcRpt1VisyBYBzcBjKHKmMzQ6+NYHNQ3Bidru+VpNWUqi/JUnD xGHRvSLtKEyslkivvk6PSHE+Epnj/aUX3jaCIa47aBqYhOLkT1BPqCZokphmSYaE+Rny LK+pAquG9JFPMajVwlZzqIdvGJTV3hqlM0YubmCI53O2RPjjtgjiJDDXigyX7BLMBvkk zWXQ== 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=B7LIQkbANATTUg9EHEacYb+VatnM6czkWIYgjmpxIsw=; b=s9Z3hxRO8v6NZneIXiIO+iOeRJG5wrqusHMEqQKj8l61tfIAfP924yKa1FWkLuAPCk 1Ak6JsLSpsyiFgcQg6QJqQl3LZVO9XKdm8jgN8eZ2sU2wRAPLdbdiZnJI/lFWITAYAy5 uUi06U7wIoLDJzlFuOc2arTWr3FCogoAXmYRoGdxUeF2awKv1wKl/rtJWFgBPhwj93xN ywWCmY6J0m++2k4tC+PWA1YOZ/wbLwKzvBq414Omt1JxqDq2bqxwAj5zIddqAvzX2Ifg Up3exzC3lVO9ykWT+XOHvwFQkkSYp3SLmcfZMxlrgCm8raou83Htlh6SOc6AyZcz2tQB JMCQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=hx1HxGdV; 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 y65si4663548wrc.268.2017.10.26.13.54.40; Thu, 26 Oct 2017 13:54:40 -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 header.s=20161025 header.b=hx1HxGdV; 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 07CF968A13C; Thu, 26 Oct 2017 23:54:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io0-f180.google.com (mail-io0-f180.google.com [209.85.223.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CB354689B62 for ; Thu, 26 Oct 2017 23:54:23 +0300 (EEST) Received: by mail-io0-f180.google.com with SMTP id 97so8312032iok.7 for ; Thu, 26 Oct 2017 13:54:32 -0700 (PDT) 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=U/sqjGIn7gR3nltHm/+qq4ogDWiDjRkuU4uDsZDYJ8E=; b=hx1HxGdVhdvQE7BYTqxTMO6gVLC0r5oe/mDT7HSmudG9+zhJVX3LHFFxlvxwIFphTI K9i/OK4lx/fx1F7I5E340DI0VCcLYBckUBAxONcIcyjjGFvVfjH5AxkM1rRzwOVfSnzd UnVWP17fhFB1K2Y9y8XPRK/lGPUtDMumIlfcEVXKVGQl5QhEKxip+zYoO8nBKd/A4AZ4 lNqORW7S3EBswd0Hh4NUNKqGtf6gR4YFx89k5vAn0PxplgaMr115mrDBrJt24Bg6Wg9o Q4muHQnE1xqCN02Vfkp6MsOcVoGpO7jbMHG9EOYeF8gRe3EouMxHI4e3EmA+BNsKL9Hr rjhg== 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=U/sqjGIn7gR3nltHm/+qq4ogDWiDjRkuU4uDsZDYJ8E=; b=pAdpHAJJRue36p5a0hbXVVN9H8f8LWipHHNFG7hOU5kPkDzr3SqYtS+VBw5MoxOOJ3 UT0u8Yh8cNlcJzVOqenbsqz52cl18l8Li/JtCnCPV3+30OUusNdT324fjJnly1RW7xjB pyNaDIuvmlxd7a9R2F1m8UYhP8m66uJn40nPzNE0r8rPsJGmLZoDwfUjufRI66zfhL5D +H8ImBCJcpE0VhUp/VnU3Qtrz+nwERpUXiJ3SSOg5ManlA4IDT9VZLX9KlANEggM19ie I4RT7ipWAUHcN6MJPf8bT1iibFzvSyL9m+PLaEHU8moepiQLzEMefwP1xDZWRn7uEd4H neug== X-Gm-Message-State: AMCzsaU7f/107zqmR7tTdS1pnfFoYgH4y1b/kOqvLwjB01cuDWejhZDy eGDqrys3/OoKsoFzGvO01ZtkuvQLERqJQPeQJD4= X-Received: by 10.36.185.21 with SMTP id w21mr363962ite.35.1509051270551; Thu, 26 Oct 2017 13:54:30 -0700 (PDT) MIME-Version: 1.0 Received: by 10.2.63.101 with HTTP; Thu, 26 Oct 2017 13:54:10 -0700 (PDT) From: Carl Eugen Hoyos Date: Thu, 26 Oct 2017 22:54:10 +0200 Message-ID: To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH]lavf: Remove AVFMT_RAWPICTURE 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! This was apparently forgotten after the bump. Please comment, Carl Eugen From 640a993f88d492045d95563e4c35843805654688 Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Thu, 26 Oct 2017 22:49:39 +0200 Subject: [PATCH] lavf: Remove AVFMT_RAWPICTURE. Deprecated since October 2015. --- fftools/ffmpeg.c | 18 ------------------ libavformat/avformat.h | 4 ---- libavformat/version.h | 3 --- 3 files changed, 25 deletions(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index d581b40..8fe66f5 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -1991,7 +1991,6 @@ static void do_streamcopy(InputStream *ist, OutputStream *ost, const AVPacket *p InputFile *f = input_files [ist->file_index]; int64_t start_time = (of->start_time == AV_NOPTS_VALUE) ? 0 : of->start_time; int64_t ost_tb_start_time = av_rescale_q(start_time, AV_TIME_BASE_Q, ost->mux_timebase); - AVPicture pict; AVPacket opkt; av_init_packet(&opkt); @@ -2079,23 +2078,6 @@ static void do_streamcopy(InputStream *ist, OutputStream *ost, const AVPacket *p } av_copy_packet_side_data(&opkt, pkt); -#if FF_API_LAVF_FMT_RAWPICTURE - if (ost->st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO && - ost->st->codecpar->codec_id == AV_CODEC_ID_RAWVIDEO && - (of->ctx->oformat->flags & AVFMT_RAWPICTURE)) { - /* store AVPicture in AVPacket, as expected by the output format */ - int ret = avpicture_fill(&pict, opkt.data, ost->st->codecpar->format, ost->st->codecpar->width, ost->st->codecpar->height); - if (ret < 0) { - av_log(NULL, AV_LOG_FATAL, "avpicture_fill failed: %s\n", - av_err2str(ret)); - exit_program(1); - } - opkt.data = (uint8_t *)&pict; - opkt.size = sizeof(AVPicture); - opkt.flags |= AV_PKT_FLAG_KEY; - } -#endif - output_packet(of, &opkt, ost, 0); } diff --git a/libavformat/avformat.h b/libavformat/avformat.h index ece1b17..65fc9ea 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -465,10 +465,6 @@ typedef struct AVProbeData { #define AVFMT_NOFILE 0x0001 #define AVFMT_NEEDNUMBER 0x0002 /**< Needs '%d' in filename. */ #define AVFMT_SHOW_IDS 0x0008 /**< Show format stream IDs numbers. */ -#if FF_API_LAVF_FMT_RAWPICTURE -#define AVFMT_RAWPICTURE 0x0020 /**< Format wants AVPicture structure for - raw picture data. @deprecated Not used anymore */ -#endif #define AVFMT_GLOBALHEADER 0x0040 /**< Format wants global header. */ #define AVFMT_NOTIMESTAMPS 0x0080 /**< Format does not need / have any timestamps. */ #define AVFMT_GENERIC_INDEX 0x0100 /**< Use generic index building code. */ diff --git a/libavformat/version.h b/libavformat/version.h index 8ae091f..ac409db 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -55,9 +55,6 @@ * at once through the bump. This improves the git bisect-ability of the change. * */ -#ifndef FF_API_LAVF_FMT_RAWPICTURE -#define FF_API_LAVF_FMT_RAWPICTURE (LIBAVFORMAT_VERSION_MAJOR < 58) -#endif #ifndef FF_API_COMPUTE_PKT_FIELDS2 #define FF_API_COMPUTE_PKT_FIELDS2 (LIBAVFORMAT_VERSION_MAJOR < 59) #endif -- 1.7.10.4