[FFmpeg-cvslog] avformat/amr: Don't reimplement ff_raw_write_packet()
Andreas Rheinhardt
git at videolan.org
Tue Apr 14 19:57:47 EEST 2020
ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at gmail.com> | Tue Apr 7 22:50:47 2020 +0200| [b5985ce44dea053d9de80b51d049dbb35e46e356] | committer: Andreas Rheinhardt
avformat/amr: Don't reimplement ff_raw_write_packet()
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b5985ce44dea053d9de80b51d049dbb35e46e356
---
libavformat/Makefile | 2 +-
libavformat/amr.c | 9 ++-------
2 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/libavformat/Makefile b/libavformat/Makefile
index 09d5c7df4b..850f250b80 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -87,7 +87,7 @@ OBJS-$(CONFIG_AIFF_MUXER) += aiffenc.o id3v2enc.o
OBJS-$(CONFIG_AIX_DEMUXER) += aixdec.o
OBJS-$(CONFIG_ALP_DEMUXER) += alp.o
OBJS-$(CONFIG_AMR_DEMUXER) += amr.o
-OBJS-$(CONFIG_AMR_MUXER) += amr.o
+OBJS-$(CONFIG_AMR_MUXER) += amr.o rawenc.o
OBJS-$(CONFIG_AMRNB_DEMUXER) += amr.o
OBJS-$(CONFIG_AMRWB_DEMUXER) += amr.o
OBJS-$(CONFIG_ANM_DEMUXER) += anm.o
diff --git a/libavformat/amr.c b/libavformat/amr.c
index b8a5debb16..e4f8e4d860 100644
--- a/libavformat/amr.c
+++ b/libavformat/amr.c
@@ -29,6 +29,7 @@ Only mono files are supported.
#include "libavutil/channel_layout.h"
#include "avformat.h"
#include "internal.h"
+#include "rawenc.h"
typedef struct {
uint64_t cumulated_size;
@@ -62,12 +63,6 @@ static int amr_write_header(AVFormatContext *s)
}
return 0;
}
-
-static int amr_write_packet(AVFormatContext *s, AVPacket *pkt)
-{
- avio_write(s->pb, pkt->data, pkt->size);
- return 0;
-}
#endif /* CONFIG_AMR_MUXER */
static int amr_probe(const AVProbeData *p)
@@ -296,7 +291,7 @@ AVOutputFormat ff_amr_muxer = {
.audio_codec = AV_CODEC_ID_AMR_NB,
.video_codec = AV_CODEC_ID_NONE,
.write_header = amr_write_header,
- .write_packet = amr_write_packet,
+ .write_packet = ff_raw_write_packet,
.flags = AVFMT_NOTIMESTAMPS,
};
#endif
More information about the ffmpeg-cvslog
mailing list