diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-10 20:58:15 +0100 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-10 20:59:55 +0100 |
| commit | 6f69f7a8bf6a0d013985578df2ef42ee6b1c7994 (patch) | |
| tree | 0c2ec8349ff1763d5f48454b8b9f26374dbd80b0 /libavdevice/jack.c | |
| parent | 60b75186b2c878b6257b43c8fcc0b1356ada218e (diff) | |
| parent | 9200514ad8717c63f82101dc394f4378854325bf (diff) | |
| download | ffmpeg-6f69f7a8bf6a0d013985578df2ef42ee6b1c7994.tar.gz | |
Merge commit '9200514ad8717c63f82101dc394f4378854325bf'
* commit '9200514ad8717c63f82101dc394f4378854325bf':
lavf: replace AVStream.codec with AVStream.codecpar
This has been a HUGE effort from:
- Derek Buitenhuis <derek.buitenhuis@gmail.com>
- Hendrik Leppkes <h.leppkes@gmail.com>
- wm4 <nfxjfg@googlemail.com>
- Clément Bœsch <clement@stupeflix.com>
- James Almer <jamrial@gmail.com>
- Michael Niedermayer <michael@niedermayer.cc>
- Rostislav Pehlivanov <atomnuker@gmail.com>
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavdevice/jack.c')
| -rw-r--r-- | libavdevice/jack.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavdevice/jack.c b/libavdevice/jack.c index 545548423d..34e21527a7 100644 --- a/libavdevice/jack.c +++ b/libavdevice/jack.c @@ -262,14 +262,14 @@ static int audio_read_header(AVFormatContext *context) return AVERROR(ENOMEM); } - stream->codec->codec_type = AVMEDIA_TYPE_AUDIO; + stream->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; #if HAVE_BIGENDIAN - stream->codec->codec_id = AV_CODEC_ID_PCM_F32BE; + stream->codecpar->codec_id = AV_CODEC_ID_PCM_F32BE; #else - stream->codec->codec_id = AV_CODEC_ID_PCM_F32LE; + stream->codecpar->codec_id = AV_CODEC_ID_PCM_F32LE; #endif - stream->codec->sample_rate = self->sample_rate; - stream->codec->channels = self->nports; + stream->codecpar->sample_rate = self->sample_rate; + stream->codecpar->channels = self->nports; avpriv_set_pts_info(stream, 64, 1, 1000000); /* 64 bits pts in us */ return 0; |