diff options
| author | Anssi Hannula <anssi@xbmc.org> | 2011-02-07 01:55:14 +0200 |
|---|---|---|
| committer | Anssi Hannula <anssi@xbmc.org> | 2011-02-07 03:02:08 +0200 |
| commit | 1499d28d3be7411c669db8f33fa1120e8610e232 (patch) | |
| tree | c534a185c1d0be29232905dcc319f5500368a767 /lib/DllAvCodec.h | |
| parent | 0f579bd75557cd7775951da3df5247719b5f9480 (diff) | |
changed: use av_set_string from the libavcodec headers
Diffstat (limited to 'lib/DllAvCodec.h')
| -rw-r--r-- | lib/DllAvCodec.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/DllAvCodec.h b/lib/DllAvCodec.h index 3113ee72b2..dee9f9bcdb 100644 --- a/lib/DllAvCodec.h +++ b/lib/DllAvCodec.h @@ -45,11 +45,13 @@ extern "C" { #if (defined USE_EXTERNAL_FFMPEG) #if (defined HAVE_LIBAVCODEC_AVCODEC_H) #include <libavcodec/avcodec.h> + #include <libavcodec/opt.h> #if (defined AVPACKET_IN_AVFORMAT) #include <libavformat/avformat.h> #endif #elif (defined HAVE_FFMPEG_AVCODEC_H) #include <ffmpeg/avcodec.h> + #include <ffmpeg/opt.h> #if (defined AVPACKET_IN_AVFORMAT) #include <ffmpeg/avformat.h> #endif @@ -124,7 +126,7 @@ public: virtual void avpicture_free(AVPicture *picture)=0; virtual void av_free_packet(AVPacket *pkt)=0; virtual int avpicture_alloc(AVPicture *picture, PixelFormat pix_fmt, int width, int height)=0; - virtual AVOption *av_set_string(void *obj, const char *name, const char *val)=0; + virtual const AVOption *av_set_string(void *obj, const char *name, const char *val)=0; virtual enum PixelFormat avcodec_default_get_format(struct AVCodecContext *s, const enum PixelFormat *fmt)=0; virtual int avcodec_default_get_buffer(AVCodecContext *s, AVFrame *pic)=0; virtual void avcodec_default_release_buffer(AVCodecContext *s, AVFrame *pic)=0; @@ -144,8 +146,6 @@ public: #if (defined USE_EXTERNAL_FFMPEG) -extern "C" { AVOption* av_set_string(void *obj, const char *name, const char *val); } - // Use direct layer class DllAvCodec : public DllDynamic, DllAvCodecInterface { @@ -208,7 +208,7 @@ public: virtual void avpicture_free(AVPicture *picture) { ::avpicture_free(picture); } virtual void av_free_packet(AVPacket *pkt) { ::av_free_packet(pkt); } virtual int avpicture_alloc(AVPicture *picture, PixelFormat pix_fmt, int width, int height) { return ::avpicture_alloc(picture, pix_fmt, width, height); } - virtual AVOption *av_set_string(void *obj, const char *name, const char *val) { return ::av_set_string(obj, name, val); } + virtual const AVOption *av_set_string(void *obj, const char *name, const char *val) { return ::av_set_string(obj, name, val); } virtual int avcodec_default_get_buffer(AVCodecContext *s, AVFrame *pic) { return ::avcodec_default_get_buffer(s, pic); } virtual void avcodec_default_release_buffer(AVCodecContext *s, AVFrame *pic) { ::avcodec_default_release_buffer(s, pic); } virtual enum PixelFormat avcodec_default_get_format(struct AVCodecContext *s, const enum PixelFormat *fmt) { return ::avcodec_default_get_format(s, fmt); } @@ -282,7 +282,7 @@ class DllAvCodec : public DllDynamic, DllAvCodecInterface DEFINE_METHOD1(void, avpicture_free, (AVPicture *p1)) DEFINE_METHOD1(void, av_free_packet, (AVPacket *p1)) DEFINE_METHOD4(int, avpicture_alloc, (AVPicture *p1, PixelFormat p2, int p3, int p4)) - DEFINE_METHOD3(AVOption*, av_set_string, (void *p1, const char *p2, const char *p3)) + DEFINE_METHOD3(const AVOption*, av_set_string, (void *p1, const char *p2, const char *p3)) DEFINE_METHOD2(int, avcodec_default_get_buffer, (AVCodecContext *p1, AVFrame *p2)) DEFINE_METHOD2(void, avcodec_default_release_buffer, (AVCodecContext *p1, AVFrame *p2)) DEFINE_METHOD2(enum PixelFormat, avcodec_default_get_format, (struct AVCodecContext *p1, const enum PixelFormat *p2)) |