aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2011-03-16 14:31:32 +0100
committerJustin Ruggles <justin.ruggles@gmail.com>2011-03-16 10:20:24 -0400
commitfed5676ffeba2a37e6233e5fef42dc50d6cfeb64 (patch)
tree67f0e1683f574073b880c0d883eebf75f118b61d
parent8312e3fc9041027a33c8bc667bb99740fdf41dd5 (diff)
downloadffmpeg-fed5676ffeba2a37e6233e5fef42dc50d6cfeb64.tar.gz
mp3enc: remove mp3_write_packet(), use ff_raw_write_packet() instead
The two functions are identical, no point in duplicating code here.
-rw-r--r--libavformat/Makefile4
-rw-r--r--libavformat/mp3enc.c13
2 files changed, 5 insertions, 12 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile
index 4eb1620700..c521cd384c 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -131,9 +131,9 @@ OBJS-$(CONFIG_MMF_MUXER) += mmf.o riff.o
OBJS-$(CONFIG_MOV_DEMUXER) += mov.o riff.o isom.o
OBJS-$(CONFIG_MOV_MUXER) += movenc.o riff.o isom.o avc.o \
movenchint.o rtpenc_chain.o
-OBJS-$(CONFIG_MP2_MUXER) += mp3enc.o
+OBJS-$(CONFIG_MP2_MUXER) += mp3enc.o rawenc.o
OBJS-$(CONFIG_MP3_DEMUXER) += mp3dec.o
-OBJS-$(CONFIG_MP3_MUXER) += mp3enc.o
+OBJS-$(CONFIG_MP3_MUXER) += mp3enc.o rawenc.o
OBJS-$(CONFIG_MPC_DEMUXER) += mpc.o apetag.o
OBJS-$(CONFIG_MPC8_DEMUXER) += mpc8.o
OBJS-$(CONFIG_MPEG1SYSTEM_MUXER) += mpegenc.o
diff --git a/libavformat/mp3enc.c b/libavformat/mp3enc.c
index 27d25f5da9..67ec826589 100644
--- a/libavformat/mp3enc.c
+++ b/libavformat/mp3enc.c
@@ -23,6 +23,7 @@
#include "avformat.h"
#include "id3v1.h"
#include "id3v2.h"
+#include "rawenc.h"
#include "libavutil/intreadwrite.h"
#include "libavutil/opt.h"
@@ -125,14 +126,6 @@ static int id3v2_put_ttag(AVFormatContext *s, const char *str1, const char *str2
return len + ID3v2_HEADER_SIZE;
}
-
-static int mp3_write_packet(struct AVFormatContext *s, AVPacket *pkt)
-{
- avio_write(s->pb, pkt->data, pkt->size);
- put_flush_packet(s->pb);
- return 0;
-}
-
static int mp3_write_trailer(struct AVFormatContext *s)
{
uint8_t buf[ID3v1_TAG_SIZE];
@@ -155,7 +148,7 @@ AVOutputFormat ff_mp2_muxer = {
CODEC_ID_MP2,
CODEC_ID_NONE,
NULL,
- mp3_write_packet,
+ ff_raw_write_packet,
mp3_write_trailer,
};
#endif
@@ -254,7 +247,7 @@ AVOutputFormat ff_mp3_muxer = {
CODEC_ID_MP3,
CODEC_ID_NONE,
mp3_write_header,
- mp3_write_packet,
+ ff_raw_write_packet,
mp3_write_trailer,
AVFMT_NOTIMESTAMPS,
.priv_class = &mp3_muxer_class,