soxenc: use ff_raw_write_packet()
authorPaul B Mahol <onemda@gmail.com>
Fri, 28 Dec 2012 21:57:01 +0000 (21:57 +0000)
committerPaul B Mahol <onemda@gmail.com>
Fri, 28 Dec 2012 21:58:03 +0000 (21:58 +0000)
Signed-off-by: Paul B Mahol <onemda@gmail.com>
libavformat/Makefile
libavformat/soxenc.c

index 587fa42..5c22c80 100644 (file)
@@ -338,7 +338,7 @@ OBJS-$(CONFIG_SMOOTHSTREAMING_MUXER)     += smoothstreamingenc.o isom.o
 OBJS-$(CONFIG_SMUSH_DEMUXER)             += smush.o
 OBJS-$(CONFIG_SOL_DEMUXER)               += sol.o pcm.o
 OBJS-$(CONFIG_SOX_DEMUXER)               += soxdec.o pcm.o
-OBJS-$(CONFIG_SOX_MUXER)                 += soxenc.o
+OBJS-$(CONFIG_SOX_MUXER)                 += soxenc.o rawenc.o
 OBJS-$(CONFIG_SPDIF_DEMUXER)             += spdif.o spdifdec.o
 OBJS-$(CONFIG_SPDIF_MUXER)               += spdif.o spdifenc.o
 OBJS-$(CONFIG_SRT_DEMUXER)               += srtdec.o
index d4d3e37..e219d75 100644 (file)
@@ -34,6 +34,7 @@
 #include "libavutil/dict.h"
 #include "avformat.h"
 #include "avio_internal.h"
+#include "rawenc.h"
 #include "sox.h"
 
 typedef struct {
@@ -84,13 +85,6 @@ static int sox_write_header(AVFormatContext *s)
     return 0;
 }
 
-static int sox_write_packet(AVFormatContext *s, AVPacket *pkt)
-{
-    AVIOContext *pb = s->pb;
-    avio_write(pb, pkt->data, pkt->size);
-    return 0;
-}
-
 static int sox_write_trailer(AVFormatContext *s)
 {
     SoXContext *sox = s->priv_data;
@@ -122,6 +116,6 @@ AVOutputFormat ff_sox_muxer = {
     .audio_codec       = AV_CODEC_ID_PCM_S32LE,
     .video_codec       = AV_CODEC_ID_NONE,
     .write_header      = sox_write_header,
-    .write_packet      = sox_write_packet,
+    .write_packet      = ff_raw_write_packet,
     .write_trailer     = sox_write_trailer,
 };