From patchwork Sat Aug 8 13:37:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zane van Iperen X-Patchwork-Id: 21537 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 3DCA144BD0C for ; Sat, 8 Aug 2020 16:38:15 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 254CB68B931; Sat, 8 Aug 2020 16:38:15 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail1.protonmail.ch (mail1.protonmail.ch [185.70.40.18]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E601668B933 for ; Sat, 8 Aug 2020 16:38:08 +0300 (EEST) Date: Sat, 08 Aug 2020 13:37:59 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zanevaniperen.com; s=protonmail; t=1596893888; bh=U8h6vy9WgvSOcXEK45VyYId8ifEKJQHQ0cC2a+PAc9E=; h=Date:To:From:Cc:Reply-To:Subject:In-Reply-To:References:From; b=LC4hgJIezLmKzEkrDtEBBO5x3aD4x3Zc0N+XdA25GF/+C/hg7pi1JOSxWe95LWCbO ah1lbxxiwWR/UqF7mM50dJY9VqNouqlze0Bem1RrrLH8qqx5XEQ/6Fhuk1st644dmq ja1T4HFzpjdgXl3eXvoallpSDHrx4Pp8vEGNVg7s= To: ffmpeg-devel@ffmpeg.org From: Zane van Iperen Message-ID: <20200808133717.2311422-3-zane@zanevaniperen.com> In-Reply-To: <20200808133717.2311422-1-zane@zanevaniperen.com> References: <20200808133717.2311422-1-zane@zanevaniperen.com> MIME-Version: 1.0 X-Spam-Status: No, score=-1.2 required=7.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF shortcircuit=no autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on mail.protonmail.ch Subject: [FFmpeg-devel] [PATCH v2 3/4] avformat/argo_asf: add name option 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: Zane van Iperen Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Zane van Iperen --- libavformat/argo_asf.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/libavformat/argo_asf.c b/libavformat/argo_asf.c index c693cfd045..7eaf2fec73 100644 --- a/libavformat/argo_asf.c +++ b/libavformat/argo_asf.c @@ -74,6 +74,7 @@ typedef struct ArgoASFMuxContext { const AVClass *class; int version_major; int version_minor; + const char *name; } ArgoASFMuxContext; #if CONFIG_ARGO_ASF_DEMUXER @@ -309,7 +310,10 @@ static int argo_asf_write_header(AVFormatContext *s) fhdr.version_minor = (uint16_t)ctx->version_minor; fhdr.num_chunks = 1; fhdr.chunk_offset = ASF_FILE_HEADER_SIZE; - strncpy(fhdr.name, av_basename(s->url), FF_ARRAY_ELEMS(fhdr.name)); + if (ctx->name) + strncpy(fhdr.name, ctx->name, sizeof(fhdr.name)); + else + strncpy(fhdr.name, av_basename(s->url), sizeof(fhdr.name)); chdr.num_blocks = 0; chdr.num_samples = ASF_SAMPLE_COUNT; @@ -370,6 +374,14 @@ static const AVOption argo_asf_options[] = { .max = UINT16_MAX, .flags = AV_OPT_FLAG_ENCODING_PARAM }, + { + .name = "name", + .help = "embedded file name (max 8 characters)", + .offset = offsetof(ArgoASFMuxContext, name), + .type = AV_OPT_TYPE_STRING, + .default_val = {.str = NULL}, + .flags = AV_OPT_FLAG_ENCODING_PARAM + }, { NULL } };