diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-15 18:28:45 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-15 18:28:45 +0200 |
| commit | ffa05e0802fd77043b5d1b1aef4aa6caee2b9291 (patch) | |
| tree | 2506e80b3ace6dd5841e6d1327fcc4c0e519ff7d /libavcodec/opus.h | |
| parent | 96cb4c87183798d1badd15a8727efba634023fc1 (diff) | |
| download | ffmpeg-ffa05e0802fd77043b5d1b1aef4aa6caee2b9291.tar.gz | |
avcodec/opusdec: switch to swresample
This also fixes linking failures in doc/examples which where apparently
caused by the linking order between avcodec and avresample
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/opus.h')
| -rw-r--r-- | libavcodec/opus.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/opus.h b/libavcodec/opus.h index a6eea02803..08c01184d0 100644 --- a/libavcodec/opus.h +++ b/libavcodec/opus.h @@ -29,7 +29,7 @@ #include "libavutil/float_dsp.h" #include "libavutil/frame.h" -#include "libavresample/avresample.h" +#include "libswresample/swresample.h" #include "avcodec.h" #include "get_bits.h" @@ -137,7 +137,7 @@ typedef struct OpusStreamContext { float *out_dummy; int out_dummy_allocated_size; - AVAudioResampleContext *avr; + SwrContext *swr; AVAudioFifo *celt_delay; int silk_samplerate; /* number of samples we still want to get from the resampler */ |