From patchwork Sun Aug 9 23:44:49 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: 21568 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 E26F9449A88 for ; Mon, 10 Aug 2020 02:45:00 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C22FE689F10; Mon, 10 Aug 2020 02:45:00 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-40131.protonmail.ch (mail-40131.protonmail.ch [185.70.40.131]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E648B688173 for ; Mon, 10 Aug 2020 02:44:54 +0300 (EEST) Date: Sun, 09 Aug 2020 23:44:49 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zanevaniperen.com; s=protonmail; t=1597016693; bh=5EIg41NBBKpdHHN2TRtEcOSxmYEGJ/zlAdEFJ/KSd1A=; h=Date:To:From:Cc:Reply-To:Subject:From; b=Uad98fqehKHK3AiCsCNeZ1OmLojatGrWrlCltq5h68xwwv7aEfGd/4g0hLO1wsk21 amO2c1jUBFTgJxotz0hav6DbKayd3uuP8V8zIa7OAKED5rD+JLdbahMx1UyI6Zorjv cvsCL0pGSStbfdZdSMk4lu6QYNe4MpeVaerrTTRI= To: ffmpeg-devel@ffmpeg.org From: Zane van Iperen Message-ID: <20200809234441.2365933-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 v3 1/5] avformat/argo_asf: add games to version list 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 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavformat/argo_asf.c b/libavformat/argo_asf.c index 671b7482f9..94d3ae3e09 100644 --- a/libavformat/argo_asf.c +++ b/libavformat/argo_asf.c @@ -87,9 +87,12 @@ static void argo_asf_parse_chunk_header(ArgoASFChunkHeader *hdr, const uint8_t * /* * Known versions: - * 1.1: The sample files in /game-formats/brender/part2.zip + * 1.1: https://samples.ffmpeg.org/game-formats/brender/part2.zip + * FX Fighter * 1.2: Croc! Legend of the Gobbos * 2.1: Croc 2 + * The Emperor's New Groove + * Disney's Aladdin in Nasira's Revenge */ static int argo_asf_is_known_version(const ArgoASFFileHeader *hdr) { From patchwork Sun Aug 9 23:44:58 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: 21569 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 2B6E744A560 for ; Mon, 10 Aug 2020 02:45:08 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1464C68A3AF; Mon, 10 Aug 2020 02:45:08 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-40134.protonmail.ch (mail-40134.protonmail.ch [185.70.40.134]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E86DF68A1AE for ; Mon, 10 Aug 2020 02:45:01 +0300 (EEST) Date: Sun, 09 Aug 2020 23:44:58 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zanevaniperen.com; s=protonmail; t=1597016701; bh=sfWa4cHF1nHw/VfOVG6C8ITR5VJkPnWMCBjgWeo9IWs=; h=Date:To:From:Cc:Reply-To:Subject:In-Reply-To:References:From; b=XLF4Xi4ZqoP7gMcItNWbFX9aNOdkgi3dmUc2M7sPlIVbibj6NUY+RLew2XJAormyf hK836LeHEkbgAgyUketSipej/WxSb+Tvlu5DBgvp9VazuVhm9xUsslBc+ymtbBDwHt HhS4XGUR7Hb6AY4l49tm8uuTcOVHXPbavKEP0rCg= To: ffmpeg-devel@ffmpeg.org From: Zane van Iperen Message-ID: <20200809234441.2365933-2-zane@zanevaniperen.com> In-Reply-To: <20200809234441.2365933-1-zane@zanevaniperen.com> References: <20200809234441.2365933-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 v3 2/5] avformat/argo_asf: don't check file version 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" It has no bearing on structure. Determined by looking at the ASF files from several Argonaut games: - FX Fighter, - Croc, - Croc 2, - The Emperor's New Groove, and - Disney's Aladdin in Nasira's Revenge The only versions that appear are 1.1, 1.2, and 2.1, and their structure is identical. Signed-off-by: Zane van Iperen --- libavformat/argo_asf.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/libavformat/argo_asf.c b/libavformat/argo_asf.c index 94d3ae3e09..bb69b01ff4 100644 --- a/libavformat/argo_asf.c +++ b/libavformat/argo_asf.c @@ -136,13 +136,6 @@ static int argo_asf_read_header(AVFormatContext *s) argo_asf_parse_file_header(&asf->fhdr, buf); - if (!argo_asf_is_known_version(&asf->fhdr)) { - avpriv_request_sample(s, "Version %hu.%hu", - asf->fhdr.version_major, asf->fhdr.version_minor - ); - return AVERROR_PATCHWELCOME; - } - if (asf->fhdr.num_chunks == 0) { return AVERROR_INVALIDDATA; } else if (asf->fhdr.num_chunks > 1) { From patchwork Sun Aug 9 23:45:07 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: 21570 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 1BAFA44A560 for ; Mon, 10 Aug 2020 02:45:20 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 01ECE68ACAE; Mon, 10 Aug 2020 02:45:20 +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 E5C0E68AAF6 for ; Mon, 10 Aug 2020 02:45:13 +0300 (EEST) Date: Sun, 09 Aug 2020 23:45:07 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zanevaniperen.com; s=protonmail; t=1597016713; bh=ZLg5F3Bj36CfzLURMjrc8fnmiCamIPB2ZLeSg5z1zJ0=; h=Date:To:From:Cc:Reply-To:Subject:In-Reply-To:References:From; b=KwkJY7pT79WNcLvQ3e5ifw7sfE8FfBO96Ahr7ob8Slm7SAleBR9zb7oKeZLWL5aDc NvWjdnLQdvGuXlKvExKO7VTvt4sGDdwYFEUv5guytgnzEc69Y9z1aLOvdtWame8Ug9 CnhoxDr59puf+w8iw493iSFX+TRVc02ggVy8YTDs= To: ffmpeg-devel@ffmpeg.org From: Zane van Iperen Message-ID: <20200809234441.2365933-3-zane@zanevaniperen.com> In-Reply-To: <20200809234441.2365933-1-zane@zanevaniperen.com> References: <20200809234441.2365933-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 v3 3/5] avformat/argo_asf: add version_major and version_minor options 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 | 47 +++++++++++++++++++++++++++++++++++++++--- 1 file changed, 44 insertions(+), 3 deletions(-) diff --git a/libavformat/argo_asf.c b/libavformat/argo_asf.c index bb69b01ff4..d25a5de37f 100644 --- a/libavformat/argo_asf.c +++ b/libavformat/argo_asf.c @@ -23,6 +23,7 @@ #include "internal.h" #include "libavutil/intreadwrite.h" #include "libavutil/avassert.h" +#include "libavutil/opt.h" #define ASF_TAG MKTAG('A', 'S', 'F', '\0') #define ASF_FILE_HEADER_SIZE 24 @@ -63,6 +64,12 @@ typedef struct ArgoASFDemuxContext { uint32_t blocks_read; } ArgoASFDemuxContext; +typedef struct ArgoASFMuxContext { + const AVClass *class; + int version_major; + int version_minor; +} ArgoASFMuxContext; + #if CONFIG_ARGO_ASF_DEMUXER static void argo_asf_parse_file_header(ArgoASFFileHeader *hdr, const uint8_t *buf) { @@ -312,12 +319,13 @@ static void argo_asf_write_chunk_header(const ArgoASFChunkHeader *ckhdr, AVIOCon static int argo_asf_write_header(AVFormatContext *s) { const AVCodecParameters *par = s->streams[0]->codecpar; + ArgoASFMuxContext *ctx = s->priv_data; ArgoASFFileHeader fhdr; ArgoASFChunkHeader chdr; fhdr.magic = ASF_TAG; - fhdr.version_major = 2; - fhdr.version_minor = 1; + fhdr.version_major = (uint16_t)ctx->version_major; + 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)); @@ -360,6 +368,37 @@ static int argo_asf_write_trailer(AVFormatContext *s) return 0; } +static const AVOption argo_asf_options[] = { + { + .name = "version_major", + .help = "override file major version", + .offset = offsetof(ArgoASFMuxContext, version_major), + .type = AV_OPT_TYPE_INT, + .default_val = {.i64 = 2}, + .min = 0, + .max = UINT16_MAX, + .flags = AV_OPT_FLAG_ENCODING_PARAM + }, + { + .name = "version_minor", + .help = "override file minor version", + .offset = offsetof(ArgoASFMuxContext, version_minor), + .type = AV_OPT_TYPE_INT, + .default_val = {.i64 = 1}, + .min = 0, + .max = UINT16_MAX, + .flags = AV_OPT_FLAG_ENCODING_PARAM + }, + { NULL } +}; + +static const AVClass argo_asf_muxer_class = { + .class_name = "argo_asf_muxer", + .item_name = av_default_item_name, + .option = argo_asf_options, + .version = LIBAVUTIL_VERSION_INT +}; + AVOutputFormat ff_argo_asf_muxer = { .name = "argo_asf", .long_name = NULL_IF_CONFIG_SMALL("Argonaut Games ASF"), @@ -372,6 +411,8 @@ AVOutputFormat ff_argo_asf_muxer = { .init = argo_asf_write_init, .write_header = argo_asf_write_header, .write_packet = argo_asf_write_packet, - .write_trailer = argo_asf_write_trailer + .write_trailer = argo_asf_write_trailer, + .priv_class = &argo_asf_muxer_class, + .priv_data_size = sizeof(ArgoASFMuxContext) }; #endif From patchwork Sun Aug 9 23:45:17 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: 21571 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 2423D44A560 for ; Mon, 10 Aug 2020 02:45:24 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0AA0368ACD0; Mon, 10 Aug 2020 02:45:24 +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 53CD168ABB4 for ; Mon, 10 Aug 2020 02:45:22 +0300 (EEST) Date: Sun, 09 Aug 2020 23:45:17 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zanevaniperen.com; s=protonmail; t=1597016721; bh=gygDTT+omrtA/bKGtmSghxWTHlmu4beCeeVRVUoSGiU=; h=Date:To:From:Cc:Reply-To:Subject:From; b=YN5TIRbBw7KOUc3gCcPxgWF9RpznvqrCcZmMS+xbumZT6wHteDVhs+wC9gJff7kaf 0SA5/juKiPvHhuXSy/KNRT2DPOdpSbjWVqzRqYfPctQGAfSQiPp+xrAJALDeLexqjD 9GG1w7850v2zK3GOo80fw0aAfmV2ZMq4Dhnig9hw= To: ffmpeg-devel@ffmpeg.org From: Zane van Iperen Message-ID: <20200809234441.2365933-4-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 v3 4/5] 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 d25a5de37f..577b9d9c01 100644 --- a/libavformat/argo_asf.c +++ b/libavformat/argo_asf.c @@ -68,6 +68,7 @@ typedef struct ArgoASFMuxContext { const AVClass *class; int version_major; int version_minor; + const char *name; } ArgoASFMuxContext; #if CONFIG_ARGO_ASF_DEMUXER @@ -328,7 +329,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; @@ -389,6 +393,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 } }; From patchwork Sun Aug 9 23:45:36 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: 21572 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 4391944A560 for ; Mon, 10 Aug 2020 02:45:45 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2937768AD4D; Mon, 10 Aug 2020 02:45:45 +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 C5E686881F1 for ; Mon, 10 Aug 2020 02:45:38 +0300 (EEST) Date: Sun, 09 Aug 2020 23:45:36 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zanevaniperen.com; s=protonmail; t=1597016738; bh=IiM3aS6TrWqL19UpS+cyJtIO4fVZgYp/3MgSmeseWpI=; h=Date:To:From:Cc:Reply-To:Subject:From; b=lR/4UyeDIkyMoykoz/8Fh8RAgnhbmjXFN8R52+bt5rm0lBnVrK5rpe8FHiHKfsyeZ D5v+cVzY2z4McCbjmPLCjElvhfb4ekLW29XNIwkrMVVZAkQtzwuSGMsmPu+jt463kn y/ooWzCLn3NgNVFRggqZpP0PnKxyWbJ5G8JyZyOM= To: ffmpeg-devel@ffmpeg.org From: Zane van Iperen Message-ID: <20200809234441.2365933-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 v3 5/5] avformat/argo_asf: strip file extension from name 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" Only when the user hasn't manually specified one. Matches the original files more closely. Signed-off-by: Zane van Iperen --- libavformat/argo_asf.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/libavformat/argo_asf.c b/libavformat/argo_asf.c index 577b9d9c01..37ad2bf5e9 100644 --- a/libavformat/argo_asf.c +++ b/libavformat/argo_asf.c @@ -329,10 +329,24 @@ 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; - if (ctx->name) + /* + * If the user specified a name, use it as is. Otherwise take the + * basename and lop off the extension (if any). + */ + if (ctx->name) { strncpy(fhdr.name, ctx->name, sizeof(fhdr.name)); - else - strncpy(fhdr.name, av_basename(s->url), sizeof(fhdr.name)); + } else { + const char *start = av_basename(s->url); + const char *end = strrchr(start, '.'); + size_t len; + + if(end) + len = end - start; + else + len = strlen(start); + + memcpy(fhdr.name, start, FFMIN(len, sizeof(fhdr.name))); + } chdr.num_blocks = 0; chdr.num_samples = ASF_SAMPLE_COUNT;