diff options
| author | Zane van Iperen <zane@zanevaniperen.com> | 2020-09-04 13:54:09 +1000 |
|---|---|---|
| committer | Zane van Iperen <zane@zanevaniperen.com> | 2020-09-14 14:24:01 +1000 |
| commit | 121016f8279fc3bce49f403e378418eaa167aae6 (patch) | |
| tree | a0646493d513d3e2179217a1df1b1f6408bcffbb | |
| parent | 442249ef2801c60fdbc6b16880617417bd6085ba (diff) | |
| download | ffmpeg-121016f8279fc3bce49f403e378418eaa167aae6.tar.gz | |
avformat/argo_asf: add ASF_MIN_BUFFER_SIZE #define
For future use by the argo_brp demuxer
Signed-off-by: Zane van Iperen <zane@zanevaniperen.com>
| -rw-r--r-- | libavformat/argo_asf.c | 2 | ||||
| -rw-r--r-- | libavformat/argo_asf.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/libavformat/argo_asf.c b/libavformat/argo_asf.c index ee8c85f735..c131207aa1 100644 --- a/libavformat/argo_asf.c +++ b/libavformat/argo_asf.c @@ -182,7 +182,7 @@ static int argo_asf_read_header(AVFormatContext *s) AVIOContext *pb = s->pb; AVStream *st; ArgoASFDemuxContext *asf = s->priv_data; - uint8_t buf[FFMAX(ASF_FILE_HEADER_SIZE, ASF_CHUNK_HEADER_SIZE)]; + uint8_t buf[ASF_MIN_BUFFER_SIZE]; if (!(st = avformat_new_stream(s, NULL))) return AVERROR(ENOMEM); diff --git a/libavformat/argo_asf.h b/libavformat/argo_asf.h index 905769dafe..8b1c6d5e2f 100644 --- a/libavformat/argo_asf.h +++ b/libavformat/argo_asf.h @@ -24,11 +24,13 @@ #define AVFORMAT_ARGO_ASF_H #include <stdint.h> +#include "libavutil/common.h" #define ASF_TAG MKTAG('A', 'S', 'F', '\0') #define ASF_FILE_HEADER_SIZE 24 #define ASF_CHUNK_HEADER_SIZE 20 #define ASF_SAMPLE_COUNT 32 +#define ASF_MIN_BUFFER_SIZE FFMAX(ASF_FILE_HEADER_SIZE, ASF_CHUNK_HEADER_SIZE) typedef struct ArgoASFFileHeader { uint32_t magic; /*< Magic Number, {'A', 'S', 'F', '\0'} */ |