diff options
| author | Anssi Hannula <anssi@xbmc.org> | 2011-02-02 01:50:54 +0200 |
|---|---|---|
| committer | Anssi Hannula <anssi@xbmc.org> | 2011-02-03 00:17:31 +0200 |
| commit | b9055f6bd0db421735cb68ff06d4badfaa56ca84 (patch) | |
| tree | a6eaddfb9d9da6bab97e174a20868aa8d586338f /lib | |
| parent | 1a6a927ec5a0c305f58fa44bc0d023e007820b64 (diff) | |
changed: stop using deprecated av_get_bits_per_sample_format
av_get_bits_per_sample_format in libavcodec has been deprecated by
av_get_bits_per_sample_fmt in libavcore. Switch to it. DllAvCore.h
handles backward compatibility with old external FFmpeg versions.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/DllAvCodec.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/lib/DllAvCodec.h b/lib/DllAvCodec.h index 5142574bd6..ee46849c68 100644 --- a/lib/DllAvCodec.h +++ b/lib/DllAvCodec.h @@ -118,7 +118,6 @@ public: virtual void avcodec_default_release_buffer(AVCodecContext *s, AVFrame *pic)=0; virtual int avcodec_thread_init(AVCodecContext *s, int thread_count)=0; virtual AVCodec *av_codec_next(AVCodec *c)=0; - virtual int av_get_bits_per_sample_format(enum SampleFormat sample_fmt)=0; virtual AVAudioConvert *av_audio_convert_alloc(enum SampleFormat out_fmt, int out_channels, enum SampleFormat in_fmt , int in_channels, const float *matrix , int flags)=0; @@ -203,8 +202,6 @@ public: virtual enum PixelFormat avcodec_default_get_format(struct AVCodecContext *s, const enum PixelFormat *fmt) { return ::avcodec_default_get_format(s, fmt); } virtual int avcodec_thread_init(AVCodecContext *s, int thread_count) { return ::avcodec_thread_init(s, thread_count); } virtual AVCodec *av_codec_next(AVCodec *c) { return ::av_codec_next(c); } - virtual int av_get_bits_per_sample_format(enum SampleFormat sample_fmt) - { return ::av_get_bits_per_sample_format(sample_fmt); } virtual AVAudioConvert *av_audio_convert_alloc(enum SampleFormat out_fmt, int out_channels, enum SampleFormat in_fmt , int in_channels, const float *matrix , int flags) @@ -280,7 +277,6 @@ class DllAvCodec : public DllDynamic, DllAvCodecInterface DEFINE_METHOD2(int, avcodec_thread_init, (AVCodecContext *p1, int p2)) DEFINE_METHOD1(AVCodec*, av_codec_next, (AVCodec *p1)) - DEFINE_METHOD1(int, av_get_bits_per_sample_format, (enum SampleFormat p1)) DEFINE_METHOD6(AVAudioConvert*, av_audio_convert_alloc, (enum SampleFormat p1, int p2, enum SampleFormat p3, int p4, const float *p5, int p6)) @@ -317,7 +313,6 @@ class DllAvCodec : public DllDynamic, DllAvCodecInterface RESOLVE_METHOD(avcodec_default_get_format) RESOLVE_METHOD(avcodec_thread_init) RESOLVE_METHOD(av_codec_next) - RESOLVE_METHOD(av_get_bits_per_sample_format) RESOLVE_METHOD(av_audio_convert_alloc) RESOLVE_METHOD(av_audio_convert_free) RESOLVE_METHOD(av_audio_convert) |