diff options
| author | Benoit Fouet <benoit.fouet@free.fr> | 2009-01-20 08:00:59 +0000 |
|---|---|---|
| committer | Benoit Fouet <benoit.fouet@free.fr> | 2009-01-20 08:00:59 +0000 |
| commit | d99b81664b2f4d0f48227fc247e77fe286cf543e (patch) | |
| tree | 1c8ab397b7a6f08763695dc19a192acab3f61e61 /libavdevice | |
| parent | 38cef584048b90d2405fdbb8b79a731535948d27 (diff) | |
| download | ffmpeg-d99b81664b2f4d0f48227fc247e77fe286cf543e.tar.gz | |
Pass avf context to audio_open().
Originally committed as revision 16694 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavdevice')
| -rw-r--r-- | libavdevice/audio.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libavdevice/audio.c b/libavdevice/audio.c index d46b3f829a..2b6c3e9569 100644 --- a/libavdevice/audio.c +++ b/libavdevice/audio.c @@ -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); |