From 0abdb2931719d96dee725e555e9b46b2b2f8a6be Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Thu, 24 Feb 2011 07:36:02 +0100 Subject: lavf: use a new ffio_wfourcc macro instead of put_tag() where possible Signed-off-by: Ronald S. Bultje --- libavformat/aiffenc.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'libavformat/aiffenc.c') 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 */ -- cgit v1.2.3