diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-17 14:30:25 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-17 14:30:25 +0200 |
| commit | fadfbb354b30f018338c66712bfe5a6b58970b9a (patch) | |
| tree | 1dc56195c0aba61f396cb679788ced1a3229fb6f /libavformat/riff.h | |
| parent | d6e87190fd0725f3517493f67dca6f8f264bb370 (diff) | |
| parent | 71e92414bfd79e56ea6fff174a665ff7b9b86e68 (diff) | |
| download | ffmpeg-fadfbb354b30f018338c66712bfe5a6b58970b9a.tar.gz | |
Merge commit '71e92414bfd79e56ea6fff174a665ff7b9b86e68'
* commit '71e92414bfd79e56ea6fff174a665ff7b9b86e68':
lavf: move RIFF INFO tag writing from avienc to riff
avconv: fix disabling auto mappings with -map_metadata
Conflicts:
ffmpeg_opt.c
libavformat/riff.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/riff.h')
| -rw-r--r-- | libavformat/riff.h | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/libavformat/riff.h b/libavformat/riff.h index 9126e404cf..6f2eeac176 100644 --- a/libavformat/riff.h +++ b/libavformat/riff.h @@ -1,5 +1,5 @@ /* - * RIFF codec tags + * RIFF common functions and data * copyright (c) 2000 Fabrice Bellard * * This file is part of FFmpeg. @@ -86,4 +86,14 @@ 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 */ |