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/openal-dec.c | |
| parent | 60b75186b2c878b6257b43c8fcc0b1356ada218e (diff) | |
| parent | 9200514ad8717c63f82101dc394f4378854325bf (diff) | |
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/openal-dec.c')
| -rw-r--r-- | libavdevice/openal-dec.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavdevice/openal-dec.c b/libavdevice/openal-dec.c index e4daf53250..0647952f9c 100644 --- a/libavdevice/openal-dec.c +++ b/libavdevice/openal-dec.c @@ -128,7 +128,7 @@ static int read_header(AVFormatContext *ctx) int error = 0; const char *error_msg; AVStream *st = NULL; - AVCodecContext *codec = NULL; + AVCodecParameters *par = NULL; if (ad->list_devices) { print_al_capture_devices(ctx); @@ -156,11 +156,11 @@ static int read_header(AVFormatContext *ctx) avpriv_set_pts_info(st, 64, 1, 1000000); /* Set codec parameters */ - codec = st->codec; - codec->codec_type = AVMEDIA_TYPE_AUDIO; - codec->sample_rate = ad->sample_rate; - codec->channels = get_al_format_info(ad->sample_format)->channels; - codec->codec_id = get_al_format_info(ad->sample_format)->codec_id; + par = st->codecpar; + par->codec_type = AVMEDIA_TYPE_AUDIO; + par->sample_rate = ad->sample_rate; + par->channels = get_al_format_info(ad->sample_format)->channels; + par->codec_id = get_al_format_info(ad->sample_format)->codec_id; /* This is needed to read the audio data */ ad->sample_step = (av_get_bits_per_sample(get_al_format_info(ad->sample_format)->codec_id) * |