[FFmpeg-cvslog] au: use ff_raw_write_packet()
Justin Ruggles
git at videolan.org
Fri Jan 4 20:55:55 CET 2013
ffmpeg | branch: master | Justin Ruggles <justin.ruggles at gmail.com> | Fri Jan 4 19:52:57 2013 +0000| [f2214c622458dc9963f775a9406174c994328405] | committer: Paul B Mahol
au: use ff_raw_write_packet()
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f2214c622458dc9963f775a9406174c994328405
---
libavformat/Makefile | 2 +-
libavformat/au.c | 11 +++--------
2 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/libavformat/Makefile b/libavformat/Makefile
index 2266dee..a857178 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -75,7 +75,7 @@ OBJS-$(CONFIG_ASS_MUXER) += assenc.o
OBJS-$(CONFIG_AST_DEMUXER) += ast.o astdec.o
OBJS-$(CONFIG_AST_MUXER) += ast.o astenc.o
OBJS-$(CONFIG_AU_DEMUXER) += au.o pcm.o
-OBJS-$(CONFIG_AU_MUXER) += au.o
+OBJS-$(CONFIG_AU_MUXER) += au.o rawenc.o
OBJS-$(CONFIG_AVI_DEMUXER) += avidec.o
OBJS-$(CONFIG_AVI_MUXER) += avienc.o
OBJS-$(CONFIG_AVISYNTH) += avisynth.o
diff --git a/libavformat/au.c b/libavformat/au.c
index 4cf8966..2e54a18 100644
--- a/libavformat/au.c
+++ b/libavformat/au.c
@@ -135,6 +135,8 @@ AVInputFormat ff_au_demuxer = {
#if CONFIG_AU_MUXER
+#include "rawenc.h"
+
/* AUDIO_FILE header */
static int put_au_header(AVIOContext *pb, AVCodecContext *enc)
{
@@ -164,13 +166,6 @@ static int au_write_header(AVFormatContext *s)
return 0;
}
-static int au_write_packet(AVFormatContext *s, AVPacket *pkt)
-{
- AVIOContext *pb = s->pb;
- avio_write(pb, pkt->data, pkt->size);
- return 0;
-}
-
static int au_write_trailer(AVFormatContext *s)
{
AVIOContext *pb = s->pb;
@@ -196,7 +191,7 @@ AVOutputFormat ff_au_muxer = {
.audio_codec = AV_CODEC_ID_PCM_S16BE,
.video_codec = AV_CODEC_ID_NONE,
.write_header = au_write_header,
- .write_packet = au_write_packet,
+ .write_packet = ff_raw_write_packet,
.write_trailer = au_write_trailer,
.codec_tag = (const AVCodecTag* const []){ codec_au_tags, 0 },
};
More information about the ffmpeg-cvslog
mailing list