diff options
| author | wm4 <wm4@nowhere> | 2013-03-09 08:49:56 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-03-13 23:51:30 +0100 |
| commit | d8bde114fd9685111274713c03985c72de3377b1 (patch) | |
| tree | a5bbfbc0423a557e559752d5bd9f5bf957d7415d /audio/decode/ad_lavc.c | |
| parent | ba5fc1d5e6c7d0762cd051edc80011faa9ab6a6a (diff) | |
| download | mpv-d8bde114fd9685111274713c03985c72de3377b1.tar.bz2 mpv-d8bde114fd9685111274713c03985c72de3377b1.tar.xz | |
Prefix CODEC_ID_ with AV_
The old names have been deprecated a while ago, but were needed for
supporting older ffmpeg/libav versions. The deprecated identifiers
have been removed from recent Libav and FFmpeg git.
This change breaks compatibility with Libav 0.8.x and equivalent
FFmpeg releases.
Diffstat (limited to 'audio/decode/ad_lavc.c')
| -rw-r--r-- | audio/decode/ad_lavc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/audio/decode/ad_lavc.c b/audio/decode/ad_lavc.c index 1f59280275..382d4eacc5 100644 --- a/audio/decode/ad_lavc.c +++ b/audio/decode/ad_lavc.c @@ -160,7 +160,7 @@ static int setup_format(sh_audio_t *sh_audio, int container_samplerate = sh_audio->container_out_samplerate; if (!container_samplerate && sh_audio->wf) container_samplerate = sh_audio->wf->nSamplesPerSec; - if (lavc_context->codec_id == CODEC_ID_AAC + if (lavc_context->codec_id == AV_CODEC_ID_AAC && samplerate == 2 * container_samplerate) broken_srate = true; else if (container_samplerate) |