diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-29 10:19:20 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-29 10:40:42 +0200 |
| commit | d9cde3976c194688a1f7d16dcb4671eb11422876 (patch) | |
| tree | eebba4a91da9261f4cdbb58dbd45b344c3aa0164 /libavformat/apetag.h | |
| parent | 53015bb3b340885d576af87afd20479ecb126bf4 (diff) | |
| parent | 2d2d6a4883479403798f4ed46941d5b365823570 (diff) | |
Merge commit '2d2d6a4883479403798f4ed46941d5b365823570'
* commit '2d2d6a4883479403798f4ed46941d5b365823570':
lavf: add a raw WavPack muxer.
apetag: add support for writing APE tags
matroskaenc: support muxing WavPack
Conflicts:
libavformat/Makefile
libavformat/allformats.c
libavformat/apetag.h
libavformat/version.h
libavformat/wvenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/apetag.h')
| -rw-r--r-- | libavformat/apetag.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/apetag.h b/libavformat/apetag.h index 0330c8986a..cf2a5f8ab4 100644 --- a/libavformat/apetag.h +++ b/libavformat/apetag.h @@ -37,8 +37,8 @@ int64_t ff_ape_parse_tag(AVFormatContext *s); /** - * Write an APEv2 tag + * Write an APE tag into a file. */ -void ff_ape_write(AVFormatContext *s); +int ff_ape_write_tag(AVFormatContext *s); #endif /* AVFORMAT_APETAG_H */ |