Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Pass avf context to audio_open().

Browse Source 
Originally committed as revision 16694 to svn://svn.ffmpeg.org/ffmpeg/trunk
pull/126/head
Benoit Fouet 16 years ago
parent 38cef58404
commit d99b81664b
1 changed files with 4 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      libavdevice/audio.c

7
libavdevice/audio.c
Unescape View File

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

Write Preview
Loading…
Cancel
Save