RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

aiffenc: use ff_raw_write_packet() 

Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Paul B Mahol 2012-12-28 22:06:39 +00:00
parent 8ad010a7e0
commit f18d2137d6
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/Makefile
View File

@ -59,7 +59,7 @@ OBJS-$(CONFIG_AEA_DEMUXER) += aea.o pcm.o
OBJS-$(CONFIG_AFC_DEMUXER) += afc.o OBJS-$(CONFIG_AFC_DEMUXER) += afc.o
OBJS-$(CONFIG_AIFF_DEMUXER) += aiffdec.o pcm.o isom.o \ OBJS-$(CONFIG_AIFF_DEMUXER) += aiffdec.o pcm.o isom.o \
mov_chan.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_DEMUXER) += amr.o
OBJS-$(CONFIG_AMR_MUXER) += amr.o OBJS-$(CONFIG_AMR_MUXER) += amr.o
OBJS-$(CONFIG_ANM_DEMUXER) += anm.o OBJS-$(CONFIG_ANM_DEMUXER) += anm.o

10
libavformat/aiffenc.c
View File

@ -25,6 +25,7 @@
#include "aiff.h" #include "aiff.h"
#include "avio_internal.h" #include "avio_internal.h"
#include "isom.h" #include "isom.h"
#include "rawenc.h"
typedef struct { typedef struct {
int64_t form; int64_t form;
@ -118,13 +119,6 @@ static int aiff_write_header(AVFormatContext *s)
return 0; 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) static int aiff_write_trailer(AVFormatContext *s)
{ {
AVIOContext *pb = s->pb; AVIOContext *pb = s->pb;
@ -170,7 +164,7 @@ AVOutputFormat ff_aiff_muxer = {
.audio_codec = AV_CODEC_ID_PCM_S16BE, .audio_codec = AV_CODEC_ID_PCM_S16BE,
.video_codec = AV_CODEC_ID_NONE, .video_codec = AV_CODEC_ID_NONE,
.write_header = aiff_write_header, .write_header = aiff_write_header,
.write_packet = aiff_write_packet, .write_packet = ff_raw_write_packet,
.write_trailer = aiff_write_trailer, .write_trailer = aiff_write_trailer,
.codec_tag = (const AVCodecTag* const []){ ff_codec_aiff_tags, 0 }, .codec_tag = (const AVCodecTag* const []){ ff_codec_aiff_tags, 0 },
}; };