Skip to content
This repository
Browse code

Merge pull request #2092 from aballier/libav

Trivial changes to improve libav support in xbmc
  • Loading branch information...
commit 529fe7568d5e6b7316f24839a1912f4062418f8b 2 parents 351c81e + 5684393
Joakim Plate authored February 03, 2013
4  lib/DllAvFormat.h
@@ -62,7 +62,6 @@ class DllAvFormatInterface
62 62
   virtual ~DllAvFormatInterface() {}
63 63
   virtual void av_register_all_dont_call(void)=0;
64 64
   virtual AVInputFormat *av_find_input_format(const char *short_name)=0;
65  
-  virtual int url_feof(AVIOContext *s)=0;
66 65
   virtual void avformat_close_input(AVFormatContext **s)=0;
67 66
   virtual int av_read_frame(AVFormatContext *s, AVPacket *pkt)=0;
68 67
   virtual void av_read_frame_flush(AVFormatContext *s)=0;
@@ -114,7 +113,6 @@ class DllAvFormat : public DllDynamic, DllAvFormatInterface
114 113
   } 
115 114
   virtual void av_register_all_dont_call() { *(volatile int* )0x0 = 0; } 
116 115
   virtual AVInputFormat *av_find_input_format(const char *short_name) { return ::av_find_input_format(short_name); }
117  
-  virtual int url_feof(AVIOContext *s) { return ::url_feof(s); }
118 116
   virtual void avformat_close_input(AVFormatContext **s) { ::avformat_close_input(s); }
119 117
   virtual int av_read_frame(AVFormatContext *s, AVPacket *pkt) { return ::av_read_frame(s, pkt); }
120 118
   virtual void av_read_frame_flush(AVFormatContext *s) { ::av_read_frame_flush(s); }
@@ -175,7 +173,6 @@ class DllAvFormat : public DllDynamic, DllAvFormatInterface
175 173
 
176 174
   DEFINE_METHOD0(void, av_register_all_dont_call)
177 175
   DEFINE_METHOD1(AVInputFormat*, av_find_input_format, (const char *p1))
178  
-  DEFINE_METHOD1(int, url_feof, (AVIOContext *p1))
179 176
   DEFINE_METHOD1(void, avformat_close_input, (AVFormatContext **p1))
180 177
   DEFINE_METHOD1(int, av_read_play, (AVFormatContext *p1))
181 178
   DEFINE_METHOD1(int, av_read_pause, (AVFormatContext *p1))
@@ -212,7 +209,6 @@ class DllAvFormat : public DllDynamic, DllAvFormatInterface
212 209
   BEGIN_METHOD_RESOLVE()
213 210
     RESOLVE_METHOD_RENAME(av_register_all, av_register_all_dont_call)
214 211
     RESOLVE_METHOD(av_find_input_format)
215  
-    RESOLVE_METHOD(url_feof)
216 212
     RESOLVE_METHOD(avformat_close_input)
217 213
     RESOLVE_METHOD(av_read_frame)
218 214
     RESOLVE_METHOD(av_read_play)
2  lib/DllSwResample.h
@@ -113,7 +113,7 @@ class DllSwResample : public DllDynamic, DllSwResampleInterface
113 113
   }
114 114
   virtual int swr_init(struct SwrContext *s) { return ::avresample_open(s); }
115 115
   virtual void swr_free(struct SwrContext **s){ ::avresample_close(*s); *s = NULL; }
116  
-  virtual int swr_convert(struct SwrContext *s, uint8_t **out, int out_count, const uint8_t **in , int in_count){ return ::avresample_convert(s, (void**)out, 0, out_count, (void**)in, 0,in_count); }
  116
+  virtual int swr_convert(struct SwrContext *s, uint8_t **out, int out_count, const uint8_t **in , int in_count){ return ::avresample_convert(s, out, 0, out_count, (uint8_t**)in, 0,in_count); }
117 117
 };
118 118
 #endif
119 119
 

0 notes on commit 529fe75

Please sign in to comment.
Something went wrong with that request. Please try again.