virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-08 13:22:53 +02:00
Code Issues Releases Activity

avformat/rso: Don't reimplement ff_raw_write_packet()

Browse Source 
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
This commit is contained in:
Andreas Rheinhardt 2020-04-07 22:53:42 +02:00
parent b5985ce44d
commit 2cae3f60bf
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/Makefile
View File

@ -444,7 +444,7 @@ OBJS-$(CONFIG_ROQ_MUXER) += idroqenc.o rawenc.o
OBJS-$(CONFIG_RSD_DEMUXER) += rsd.o
OBJS-$(CONFIG_RPL_DEMUXER) += rpl.o
OBJS-$(CONFIG_RSO_DEMUXER) += rsodec.o rso.o pcm.o
OBJS-$(CONFIG_RSO_MUXER) += rsoenc.o rso.o
OBJS-$(CONFIG_RSO_MUXER) += rsoenc.o rso.o rawenc.o
OBJS-$(CONFIG_RTP_MPEGTS_MUXER) += rtpenc_mpegts.o
OBJS-$(CONFIG_RTP_MUXER) += rtp.o \
rtpenc_aac.o \

9
libavformat/rsoenc.c
View File

@ -22,6 +22,7 @@
#include "avformat.h"
#include "internal.h"
#include "rawenc.h"
#include "riff.h"
#include "rso.h"
@ -63,12 +64,6 @@ static int rso_write_header(AVFormatContext *s)
return 0;
}
static int rso_write_packet(AVFormatContext *s, AVPacket *pkt)
{
avio_write(s->pb, pkt->data, pkt->size);
return 0;
}
static int rso_write_trailer(AVFormatContext *s)
{
AVIOContext *pb = s->pb;
@ -103,7 +98,7 @@ AVOutputFormat ff_rso_muxer = {
.audio_codec = AV_CODEC_ID_PCM_U8,
.video_codec = AV_CODEC_ID_NONE,
.write_header = rso_write_header,
.write_packet = rso_write_packet,
.write_packet = ff_raw_write_packet,
.write_trailer = rso_write_trailer,
.codec_tag = (const AVCodecTag* const []){ff_codec_rso_tags, 0},
.flags = AVFMT_NOTIMESTAMPS,