Commit 3f8ee30e authored by Paul B Mahol's avatar Paul B Mahol

mmfenc: use ff_raw_write_packet()

Signed-off-by: 's avatarPaul B Mahol <onemda@gmail.com>
parent f18d2137
...@@ -197,7 +197,7 @@ OBJS-$(CONFIG_MLP_DEMUXER) += rawdec.o ...@@ -197,7 +197,7 @@ OBJS-$(CONFIG_MLP_DEMUXER) += rawdec.o
OBJS-$(CONFIG_MLP_MUXER) += rawenc.o OBJS-$(CONFIG_MLP_MUXER) += rawenc.o
OBJS-$(CONFIG_MM_DEMUXER) += mm.o OBJS-$(CONFIG_MM_DEMUXER) += mm.o
OBJS-$(CONFIG_MMF_DEMUXER) += mmf.o OBJS-$(CONFIG_MMF_DEMUXER) += mmf.o
OBJS-$(CONFIG_MMF_MUXER) += mmf.o OBJS-$(CONFIG_MMF_MUXER) += mmf.o rawenc.o
OBJS-$(CONFIG_MOV_DEMUXER) += mov.o isom.o mov_chan.o OBJS-$(CONFIG_MOV_DEMUXER) += mov.o isom.o mov_chan.o
OBJS-$(CONFIG_MOV_MUXER) += movenc.o isom.o avc.o \ OBJS-$(CONFIG_MOV_MUXER) += movenc.o isom.o avc.o \
movenchint.o rtpenc_chain.o \ movenchint.o rtpenc_chain.o \
......
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
#include "internal.h" #include "internal.h"
#include "avio_internal.h" #include "avio_internal.h"
#include "pcm.h" #include "pcm.h"
#include "rawenc.h"
#include "riff.h" #include "riff.h"
typedef struct { typedef struct {
...@@ -110,13 +111,6 @@ static int mmf_write_header(AVFormatContext *s) ...@@ -110,13 +111,6 @@ static int mmf_write_header(AVFormatContext *s)
return 0; return 0;
} }
static int mmf_write_packet(AVFormatContext *s, AVPacket *pkt)
{
AVIOContext *pb = s->pb;
avio_write(pb, pkt->data, pkt->size);
return 0;
}
/* Write a variable-length symbol */ /* Write a variable-length symbol */
static void put_varlength(AVIOContext *pb, int val) static void put_varlength(AVIOContext *pb, int val)
{ {
...@@ -304,7 +298,7 @@ AVOutputFormat ff_mmf_muxer = { ...@@ -304,7 +298,7 @@ AVOutputFormat ff_mmf_muxer = {
.audio_codec = AV_CODEC_ID_ADPCM_YAMAHA, .audio_codec = AV_CODEC_ID_ADPCM_YAMAHA,
.video_codec = AV_CODEC_ID_NONE, .video_codec = AV_CODEC_ID_NONE,
.write_header = mmf_write_header, .write_header = mmf_write_header,
.write_packet = mmf_write_packet, .write_packet = ff_raw_write_packet,
.write_trailer = mmf_write_trailer, .write_trailer = mmf_write_trailer,
}; };
#endif #endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment