From patchwork Sat Aug 8 08:01:20 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: 21533 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 949B8449249 for ; Sat, 8 Aug 2020 11:01:27 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7AD1068B8BF; Sat, 8 Aug 2020 11:01:27 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-40136.protonmail.ch (mail-40136.protonmail.ch [185.70.40.136]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4112168B8AF for ; Sat, 8 Aug 2020 11:01:26 +0300 (EEST) Date: Sat, 08 Aug 2020 08:01:20 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zanevaniperen.com; s=protonmail; t=1596873685; bh=hZYtXbV1cjjaR6Mk9CSUoX1WHs8JGGqmj4mQcZCPHGU=; h=Date:To:From:Cc:Reply-To:Subject:From; b=jHSi2LcLgW5EZx8zzup8id7k4zMUmEIVD8gJNqHuIyqhdqTrZ/Ut9/ejN2/yhc+aC gL33wTRN/BNhU2AT5aZlT24Ud5bItDdXNBEB+4PCLj4TlzCpbnpyejq2Y5eYaLpEjm IO5vDcViuApVS1S4SZlWeppxkVkEVnr3pcuHzgjw= To: ffmpeg-devel@ffmpeg.org From: Zane van Iperen Message-ID: <20200808075914.2296555-5-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 5/6] 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 9845cb955b..3499519903 100644 --- a/libavformat/argo_asf.c +++ b/libavformat/argo_asf.c @@ -69,6 +69,7 @@ typedef struct ArgoASFContext { ArgoASFFileHeader fhdr; ArgoASFChunkHeader ckhdr; uint32_t blocks_read; + const char *name; } ArgoASFContext; #if CONFIG_ARGO_ASF_DEMUXER @@ -301,7 +302,10 @@ static int argo_asf_write_header(AVFormatContext *s) /* version_{major,minor} set by options. */ ctx->fhdr.num_chunks = 1; ctx->fhdr.chunk_offset = ASF_FILE_HEADER_SIZE; - strncpy(ctx->fhdr.name, av_basename(s->url), FF_ARRAY_ELEMS(ctx->fhdr.name)); + if (ctx->name) + strncpy(ctx->fhdr.name, ctx->name, FF_ARRAY_ELEMS(ctx->fhdr.name)); + else + strncpy(ctx->fhdr.name, av_basename(s->url), FF_ARRAY_ELEMS(ctx->fhdr.name)); ctx->ckhdr.num_blocks = 0; ctx->ckhdr.num_samples = ASF_SAMPLE_COUNT; @@ -362,6 +366,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(ArgoASFContext, name), + .type = AV_OPT_TYPE_STRING, + .default_val = {.str = NULL}, + .flags = AV_OPT_FLAG_ENCODING_PARAM + }, { NULL } };