highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

auenc: remove put_au_header() and merge its code into au_write_header

Browse Source 
Such level of abstraction is pointless.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Paul B Mahol 2013-01-30 22:10:33 +00:00
parent 984add64a4
commit 10e4905dd9
1 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libavformat/au.c
View File

@ -151,9 +151,11 @@ AVInputFormat ff_au_demuxer = {
#include "rawenc.h" #include "rawenc.h"
/* AUDIO_FILE header */ static int au_write_header(AVFormatContext *s)
static int put_au_header(AVIOContext *pb, AVCodecContext *enc)
{ {
AVIOContext *pb = s->pb;
AVCodecContext *enc = s->streams[0]->codec;
if (!enc->codec_tag) if (!enc->codec_tag)
return AVERROR(EINVAL); return AVERROR(EINVAL);
@ -164,18 +166,6 @@ static int put_au_header(AVIOContext *pb, AVCodecContext *enc)
avio_wb32(pb, enc->sample_rate); avio_wb32(pb, enc->sample_rate);
avio_wb32(pb, enc->channels); avio_wb32(pb, enc->channels);
avio_wb64(pb, 0); /* annotation field */ avio_wb64(pb, 0); /* annotation field */
return 0;
}
static int au_write_header(AVFormatContext *s)
{
AVIOContext *pb = s->pb;
int ret;
if ((ret = put_au_header(pb, s->streams[0]->codec)) < 0)
return ret;
avio_flush(pb); avio_flush(pb);
return 0; return 0;