diff options
| author | Paul B Mahol <onemda@gmail.com> | 2012-12-28 22:06:39 +0000 |
|---|---|---|
| committer | Paul B Mahol <onemda@gmail.com> | 2012-12-28 22:06:39 +0000 |
| commit | f18d2137d6e72fa2b65e5c4d4c3544f54498ef9a (patch) | |
| tree | 0e3cae0daed99ae7dfaf6571802c6e322fdc4fe4 | |
| parent | 8ad010a7e080cf622cbc65f8ee9f33f3360cc57e (diff) | |
| download | ffmpeg-f18d2137d6e72fa2b65e5c4d4c3544f54498ef9a.tar.gz | |
aiffenc: use ff_raw_write_packet()
Signed-off-by: Paul B Mahol <onemda@gmail.com>
| -rw-r--r-- | libavformat/Makefile | 2 | ||||
| -rw-r--r-- | libavformat/aiffenc.c | 10 |
2 files changed, 3 insertions, 9 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile index 5c22c809d4..0115334868 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -59,7 +59,7 @@ OBJS-$(CONFIG_AEA_DEMUXER) += aea.o pcm.o OBJS-$(CONFIG_AFC_DEMUXER) += afc.o OBJS-$(CONFIG_AIFF_DEMUXER) += aiffdec.o pcm.o isom.o \ mov_chan.o -OBJS-$(CONFIG_AIFF_MUXER) += aiffenc.o isom.o +OBJS-$(CONFIG_AIFF_MUXER) += aiffenc.o isom.o rawenc.o OBJS-$(CONFIG_AMR_DEMUXER) += amr.o OBJS-$(CONFIG_AMR_MUXER) += amr.o OBJS-$(CONFIG_ANM_DEMUXER) += anm.o diff --git a/libavformat/aiffenc.c b/libavformat/aiffenc.c index ba5f607ff8..df6c756b7a 100644 --- a/libavformat/aiffenc.c +++ b/libavformat/aiffenc.c @@ -25,6 +25,7 @@ #include "aiff.h" #include "avio_internal.h" #include "isom.h" +#include "rawenc.h" typedef struct { int64_t form; @@ -118,13 +119,6 @@ static int aiff_write_header(AVFormatContext *s) return 0; } -static int aiff_write_packet(AVFormatContext *s, AVPacket *pkt) -{ - AVIOContext *pb = s->pb; - avio_write(pb, pkt->data, pkt->size); - return 0; -} - static int aiff_write_trailer(AVFormatContext *s) { AVIOContext *pb = s->pb; @@ -170,7 +164,7 @@ AVOutputFormat ff_aiff_muxer = { .audio_codec = AV_CODEC_ID_PCM_S16BE, .video_codec = AV_CODEC_ID_NONE, .write_header = aiff_write_header, - .write_packet = aiff_write_packet, + .write_packet = ff_raw_write_packet, .write_trailer = aiff_write_trailer, .codec_tag = (const AVCodecTag* const []){ ff_codec_aiff_tags, 0 }, }; |