virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Pass avf context to audio_open().

Browse Source 
Originally committed as revision 16694 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Benoit Fouet 2009-01-20 08:00:59 +00:00
parent 38cef58404
commit d99b81664b
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavdevice/audio.c
View File

@ -53,8 +53,9 @@ typedef struct {
int buffer_ptr;
} AudioData;
static int audio_open(AudioData *s, int is_output, const char *audio_device)
static int audio_open(AVFormatContext *s1, int is_output, const char *audio_device)
{
AudioData *s = s1->priv_data;
int audio_fd;
int tmp, err;
char *flip = getenv("AUDIO_FLIP_LEFT");
@ -162,7 +163,7 @@ static int audio_write_header(AVFormatContext *s1)
st = s1->streams[0];
s->sample_rate = st->codec->sample_rate;
s->channels = st->codec->channels;
ret = audio_open(s, 1, s1->filename);
ret = audio_open(s1, 1, s1->filename);
if (ret < 0) {
return AVERROR(EIO);
} else {
@ -225,7 +226,7 @@ static int audio_read_header(AVFormatContext *s1, AVFormatParameters *ap)
s->sample_rate = ap->sample_rate;
s->channels = ap->channels;
ret = audio_open(s, 0, s1->filename);
ret = audio_open(s1, 0, s1->filename);
if (ret < 0) {
av_free(st);
return AVERROR(EIO);