diff options
Diffstat (limited to 'ffmpeg/libavformat/riff.h')
| -rw-r--r-- | ffmpeg/libavformat/riff.h | 49 |
1 files changed, 25 insertions, 24 deletions
diff --git a/ffmpeg/libavformat/riff.h b/ffmpeg/libavformat/riff.h index 70b2f76..ce07869 100644 --- a/ffmpeg/libavformat/riff.h +++ b/ffmpeg/libavformat/riff.h @@ -34,7 +34,6 @@ #include "metadata.h" extern const AVMetadataConv ff_riff_info_conv[]; -extern const char ff_riff_tags[][5]; int64_t ff_start_tag(AVIOContext *pb, const char *tag); void ff_end_tag(AVIOContext *pb, int64_t start); @@ -46,7 +45,7 @@ void ff_end_tag(AVIOContext *pb, int64_t start); */ int ff_get_bmp_header(AVIOContext *pb, AVStream *st, unsigned *esize); -void ff_put_bmp_header(AVIOContext *pb, AVCodecContext *enc, const AVCodecTag *tags, int for_asf); +void ff_put_bmp_header(AVIOContext *pb, AVCodecContext *enc, const AVCodecTag *tags, int for_asf, int ignore_extradata); int ff_put_wav_header(AVIOContext *pb, AVCodecContext *enc); enum AVCodecID ff_wav_codec_get_id(unsigned int tag, int bps); int ff_get_wav_header(AVIOContext *pb, AVCodecContext *codec, int size); @@ -56,14 +55,36 @@ extern const AVCodecTag ff_codec_wav_tags[]; void ff_parse_specific_params(AVCodecContext *stream, int *au_rate, int *au_ssize, int *au_scale); +int ff_read_riff_info(AVFormatContext *s, int64_t size); + +/** + * Write all recognized RIFF tags from s->metadata + */ +void ff_riff_write_info(AVFormatContext *s); + +/** + * Write a single RIFF info tag + */ +void ff_riff_write_info_tag(AVIOContext *pb, const char *tag, const char *str); + typedef uint8_t ff_asf_guid[16]; -int ff_read_riff_info(AVFormatContext *s, int64_t size); +typedef struct AVCodecGuid { + enum AVCodecID id; + ff_asf_guid guid; +} AVCodecGuid; + +extern const AVCodecGuid ff_codec_wav_guids[]; #define FF_PRI_GUID \ "%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x" + #define FF_ARG_GUID(g) \ - g[0],g[1],g[2],g[3],g[4],g[5],g[6],g[7],g[8],g[9],g[10],g[11],g[12],g[13],g[14],g[15] + g[0], g[1], g[2], g[3], g[4], g[5], g[6], g[7], \ + g[8], g[9], g[10], g[11], g[12], g[13], g[14], g[15] + +#define FF_MEDIASUBTYPE_BASE_GUID \ + 0x00, 0x00, 0x10, 0x00, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71 static av_always_inline int ff_guidcmp(const void *g1, const void *g2) { @@ -72,26 +93,6 @@ static av_always_inline int ff_guidcmp(const void *g1, const void *g2) void ff_get_guid(AVIOContext *s, ff_asf_guid *g); -typedef struct { - enum AVCodecID id; - ff_asf_guid guid; -} AVCodecGuid; - enum AVCodecID ff_codec_guid_get_id(const AVCodecGuid *guids, ff_asf_guid guid); -extern const AVCodecGuid ff_codec_wav_guids[]; - -#define FF_MEDIASUBTYPE_BASE_GUID \ - 0x00,0x00,0x10,0x00,0x80,0x00,0x00,0xAA,0x00,0x38,0x9B,0x71 - -/** - * Write all recognized RIFF tags from s->metadata - */ -void ff_riff_write_info(AVFormatContext *s); - -/** - * Write a single RIFF info tag - */ -void ff_riff_write_info_tag(AVIOContext *pb, const char *tag, const char *str); - #endif /* AVFORMAT_RIFF_H */ |