diff options
| author | Alexis Ballier <aballier@gentoo.org> | 2013-06-14 11:02:08 -0400 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2013-07-01 08:47:51 -0400 |
| commit | 54f118123eba02f56a240968dcff28c530b6cbc7 (patch) | |
| tree | 3d6695bcf77a03ca317349717aac706924274827 /lib | |
| parent | 24b90e4881445f98d079bf6c6091333e1c4fac11 (diff) | |
Replace deprecated CodedID and CODEC_ID by their av prefixed counterparts.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/DllAvCodec.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/DllAvCodec.h b/lib/DllAvCodec.h index cf52a14c14..8a439d506d 100644 --- a/lib/DllAvCodec.h +++ b/lib/DllAvCodec.h @@ -64,8 +64,8 @@ public: virtual void avcodec_register_all(void)=0; virtual void avcodec_flush_buffers(AVCodecContext *avctx)=0; virtual int avcodec_open2_dont_call(AVCodecContext *avctx, AVCodec *codec, AVDictionary **options)=0; - virtual AVCodec *avcodec_find_decoder(enum CodecID id)=0; - virtual AVCodec *avcodec_find_encoder(enum CodecID id)=0; + virtual AVCodec *avcodec_find_decoder(enum AVCodecID id)=0; + virtual AVCodec *avcodec_find_encoder(enum AVCodecID id)=0; virtual int avcodec_close_dont_call(AVCodecContext *avctx)=0; virtual AVFrame *avcodec_alloc_frame(void)=0; virtual int avpicture_fill(AVPicture *picture, uint8_t *ptr, PixelFormat pix_fmt, int width, int height)=0; @@ -124,8 +124,8 @@ public: } virtual int avcodec_open2_dont_call(AVCodecContext *avctx, AVCodec *codec, AVDictionary **options) { *(volatile int *)0x0 = 0; return 0; } virtual int avcodec_close_dont_call(AVCodecContext *avctx) { *(volatile int *)0x0 = 0; return 0; } - virtual AVCodec *avcodec_find_decoder(enum CodecID id) { return ::avcodec_find_decoder(id); } - virtual AVCodec *avcodec_find_encoder(enum CodecID id) { return ::avcodec_find_encoder(id); } + virtual AVCodec *avcodec_find_decoder(enum AVCodecID id) { return ::avcodec_find_decoder(id); } + virtual AVCodec *avcodec_find_encoder(enum AVCodecID id) { return ::avcodec_find_encoder(id); } virtual int avcodec_close(AVCodecContext *avctx) { CSingleLock lock(DllAvCodec::m_critSection); @@ -202,8 +202,8 @@ class DllAvCodec : public DllDynamic, DllAvCodecInterface LOAD_SYMBOLS(); DEFINE_METHOD0(void, avcodec_register_all_dont_call) - DEFINE_METHOD1(AVCodec*, avcodec_find_decoder, (enum CodecID p1)) - DEFINE_METHOD1(AVCodec*, avcodec_find_encoder, (enum CodecID p1)) + DEFINE_METHOD1(AVCodec*, avcodec_find_decoder, (enum AVCodecID p1)) + DEFINE_METHOD1(AVCodec*, avcodec_find_encoder, (enum AVCodecID p1)) DEFINE_METHOD1(int, avcodec_close_dont_call, (AVCodecContext *p1)) DEFINE_METHOD0(AVFrame*, avcodec_alloc_frame) DEFINE_METHOD5(int, avpicture_fill, (AVPicture *p1, uint8_t *p2, PixelFormat p3, int p4, int p5)) |