diff options
| author | Alexis Ballier <aballier@gentoo.org> | 2012-03-01 10:22:11 -0300 |
|---|---|---|
| committer | elupus <elupus@xbmc.org> | 2012-03-31 16:28:36 +0200 |
| commit | 0bf68bf61aab44ccf6f54a2923ed567f9a56af4a (patch) | |
| tree | bc1c7ed6daaddc5151abe22ed0d3c3ec851480d2 /lib/DllAvFormat.h | |
| parent | f6610b1ba67a10ae4e2a1b6ad425687b8d928718 (diff) | |
Drop url_set_interrupt_cb usage which was removed in libavformat 54 and set the callback directly in the AVFormatContext, which was added in libavformat-53.15.0
Diffstat (limited to 'lib/DllAvFormat.h')
| -rw-r--r-- | lib/DllAvFormat.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/lib/DllAvFormat.h b/lib/DllAvFormat.h index d6753ae09e..405a58b149 100644 --- a/lib/DllAvFormat.h +++ b/lib/DllAvFormat.h @@ -74,7 +74,6 @@ public: #if (!defined USE_EXTERNAL_FFMPEG) virtual int avformat_find_stream_info_dont_call(AVFormatContext *ic, AVDictionary **options)=0; #endif - virtual void url_set_interrupt_cb(URLInterruptCB *interrupt_cb)=0; virtual int avformat_open_input(AVFormatContext **ps, const char *filename, AVInputFormat *fmt, AVDictionary **options)=0; virtual int init_put_byte(AVIOContext *s, unsigned char *buffer, int buffer_size, int write_flag, void *opaque, int (*read_packet)(void *opaque, uint8_t *buf, int buf_size), @@ -139,7 +138,6 @@ public: CSingleLock lock(DllAvCodec::m_critSection); return ::avformat_find_stream_info(ic, options); } - virtual void url_set_interrupt_cb(URLInterruptCB *interrupt_cb) { ::url_set_interrupt_cb(interrupt_cb); } virtual int avformat_open_input(AVFormatContext **ps, const char *filename, AVInputFormat *fmt, AVDictionary **options) { return ::avformat_open_input(ps, filename, fmt, options); } virtual int init_put_byte(AVIOContext *s, unsigned char *buffer, int buffer_size, int write_flag, void *opaque, @@ -216,7 +214,6 @@ class DllAvFormat : public DllDynamic, DllAvFormatInterface DEFINE_FUNC_ALIGNED2(void, __cdecl, put_be24, AVIOContext*, unsigned int) DEFINE_FUNC_ALIGNED2(void, __cdecl, put_be32, AVIOContext*, unsigned int) DEFINE_FUNC_ALIGNED2(void, __cdecl, put_be16, AVIOContext*, unsigned int) - DEFINE_METHOD1(void, url_set_interrupt_cb, (URLInterruptCB *p1)) DEFINE_METHOD8(int, init_put_byte, (AVIOContext *p1, unsigned char *p2, int p3, int p4, void *p5, int (*p6)(void *opaque, uint8_t *buf, int buf_size), int (*p7)(void *opaque, uint8_t *buf, int buf_size), @@ -253,7 +250,6 @@ class DllAvFormat : public DllDynamic, DllAvFormatInterface RESOLVE_METHOD(av_read_frame_flush) RESOLVE_METHOD(av_seek_frame) RESOLVE_METHOD_RENAME(avformat_find_stream_info, avformat_find_stream_info_dont_call) - RESOLVE_METHOD(url_set_interrupt_cb) RESOLVE_METHOD(avformat_open_input) RESOLVE_METHOD(init_put_byte) RESOLVE_METHOD(av_probe_input_format) |