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

au: use ff_raw_write_packet()

Browse Source
This commit is contained in:
Justin Ruggles
2012-12-23 14:14:38 -05:00
parent bdd00e2d1b
commit c88d245c98
2 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/Makefile
View File

@@ -65,7 +65,7 @@ OBJS-$(CONFIG_ASF_MUXER) += asfenc.o asf.o
OBJS-$(CONFIG_ASS_DEMUXER) += assdec.o OBJS-$(CONFIG_ASS_DEMUXER) += assdec.o
OBJS-$(CONFIG_ASS_MUXER) += assenc.o OBJS-$(CONFIG_ASS_MUXER) += assenc.o
OBJS-$(CONFIG_AU_DEMUXER) += au.o pcm.o OBJS-$(CONFIG_AU_DEMUXER) += au.o pcm.o
OBJS-$(CONFIG_AU_MUXER) += au.o OBJS-$(CONFIG_AU_MUXER) += au.o rawenc.o
OBJS-$(CONFIG_AVI_DEMUXER) += avidec.o OBJS-$(CONFIG_AVI_DEMUXER) += avidec.o
OBJS-$(CONFIG_AVI_MUXER) += avienc.o OBJS-$(CONFIG_AVI_MUXER) += avienc.o
OBJS-$(CONFIG_AVISYNTH) += avisynth.o OBJS-$(CONFIG_AVISYNTH) += avisynth.o

11
libavformat/au.c
View File

@@ -154,6 +154,8 @@ AVInputFormat ff_au_demuxer = {
#if CONFIG_AU_MUXER #if CONFIG_AU_MUXER
#include "rawenc.h"
/* if we don't know the size in advance */ /* if we don't know the size in advance */
#define AU_UNKNOWN_SIZE ((uint32_t)(~0)) #define AU_UNKNOWN_SIZE ((uint32_t)(~0))
@@ -187,13 +189,6 @@ static int au_write_header(AVFormatContext *s)
return 0; return 0;
} }
static int au_write_packet(AVFormatContext *s, AVPacket *pkt)
{
AVIOContext *pb = s->pb;
avio_write(pb, pkt->data, pkt->size);
return 0;
}
static int au_write_trailer(AVFormatContext *s) static int au_write_trailer(AVFormatContext *s)
{ {
AVIOContext *pb = s->pb; AVIOContext *pb = s->pb;
@@ -221,7 +216,7 @@ AVOutputFormat ff_au_muxer = {
.audio_codec = AV_CODEC_ID_PCM_S16BE, .audio_codec = AV_CODEC_ID_PCM_S16BE,
.video_codec = AV_CODEC_ID_NONE, .video_codec = AV_CODEC_ID_NONE,
.write_header = au_write_header, .write_header = au_write_header,
.write_packet = au_write_packet, .write_packet = ff_raw_write_packet,
.write_trailer = au_write_trailer, .write_trailer = au_write_trailer,
.codec_tag = (const AVCodecTag* const []){ codec_au_tags, 0 }, .codec_tag = (const AVCodecTag* const []){ codec_au_tags, 0 },
}; };