diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-02-24 07:36:02 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-02-26 03:16:04 +0100 |
| commit | 324429309ee3090b4a08b04ab50be76751a16dbd (patch) | |
| tree | 9dec7f2f3c87755e6212be22e059afa7793ab601 /libavformat/aiffenc.c | |
| parent | 853daff68210e4c2bf72afa2f757f89146e5d8c2 (diff) | |
| download | ffmpeg-324429309ee3090b4a08b04ab50be76751a16dbd.tar.gz | |
lavf: use a new ffio_wfourcc macro instead of put_tag() where possible
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 0abdb2931719d96dee725e555e9b46b2b2f8a6be)
Diffstat (limited to 'libavformat/aiffenc.c')
| -rw-r--r-- | libavformat/aiffenc.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/libavformat/aiffenc.c b/libavformat/aiffenc.c index 49aff8bd78..de88382e67 100644 --- a/libavformat/aiffenc.c +++ b/libavformat/aiffenc.c @@ -21,6 +21,7 @@ #include "avformat.h" #include "aiff.h" +#include "avio_internal.h" typedef struct { int64_t form; @@ -43,10 +44,10 @@ static int aiff_write_header(AVFormatContext *s) aifc = 1; /* FORM AIFF header */ - put_tag(pb, "FORM"); + ffio_wfourcc(pb, "FORM"); aiff->form = url_ftell(pb); avio_wb32(pb, 0); /* file length */ - put_tag(pb, aifc ? "AIFC" : "AIFF"); + ffio_wfourcc(pb, aifc ? "AIFC" : "AIFF"); if (aifc) { // compressed audio enc->bits_per_coded_sample = 16; @@ -55,13 +56,13 @@ static int aiff_write_header(AVFormatContext *s) return -1; } /* Version chunk */ - put_tag(pb, "FVER"); + ffio_wfourcc(pb, "FVER"); avio_wb32(pb, 4); avio_wb32(pb, 0xA2805140); } /* Common chunk */ - put_tag(pb, "COMM"); + ffio_wfourcc(pb, "COMM"); avio_wb32(pb, aifc ? 24 : 18); /* size */ avio_wb16(pb, enc->channels); /* Number of channels */ @@ -88,7 +89,7 @@ static int aiff_write_header(AVFormatContext *s) } /* Sound data chunk */ - put_tag(pb, "SSND"); + ffio_wfourcc(pb, "SSND"); aiff->ssnd = url_ftell(pb); /* Sound chunk size */ avio_wb32(pb, 0); /* Sound samples data size */ avio_wb32(pb, 0); /* Data offset */ |