X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Fargo_asf.h;h=e65125fb79d77ab9ae09a0f474c012fbfd790fdf;hb=e83717e63eab1f1b78dc0990e5b8e927097fca29;hp=905769dafe5bc56df88b86d3568a4786709a1295;hpb=442249ef2801c60fdbc6b16880617417bd6085ba;p=ffmpeg diff --git a/libavformat/argo_asf.h b/libavformat/argo_asf.h index 905769dafe5..e65125fb79d 100644 --- a/libavformat/argo_asf.h +++ b/libavformat/argo_asf.h @@ -24,11 +24,15 @@ #define AVFORMAT_ARGO_ASF_H #include +#include "libavutil/common.h" + +#include "avformat.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'} */ @@ -61,7 +65,7 @@ enum { void ff_argo_asf_parse_file_header(ArgoASFFileHeader *hdr, const uint8_t *buf); int ff_argo_asf_validate_file_header(AVFormatContext *s, const ArgoASFFileHeader *hdr); void ff_argo_asf_parse_chunk_header(ArgoASFChunkHeader *hdr, const uint8_t *buf); -int ff_argo_asf_fill_stream(AVStream *st, const ArgoASFFileHeader *fhdr, +int ff_argo_asf_fill_stream(AVFormatContext *s, AVStream *st, const ArgoASFFileHeader *fhdr, const ArgoASFChunkHeader *ckhdr); #endif /* AVFORMAT_ARGO_ASF_H */