60 lines
3.8 KiB
Diff
60 lines
3.8 KiB
Diff
commit 3d4c4fe835bb7a46c5970674b0c6c416fb3822f1
|
|
Author: Alexis Ballier <aballier@gentoo.org>
|
|
Date: Thu Mar 1 11:22:51 2012 -0300
|
|
|
|
Replace dump_format by av_dump_format.
|
|
|
|
diff --git a/lib/DllAvFormat.h b/lib/DllAvFormat.h
|
|
index e3f0a9a..7f88c7b 100644
|
|
--- a/lib/DllAvFormat.h
|
|
+++ b/lib/DllAvFormat.h
|
|
@@ -80,7 +80,7 @@ public:
|
|
virtual AVInputFormat *av_probe_input_format(AVProbeData *pd, int is_opened)=0;
|
|
virtual AVInputFormat *av_probe_input_format2(AVProbeData *pd, int is_opened, int *score_max)=0;
|
|
virtual int av_probe_input_buffer(AVIOContext *pb, AVInputFormat **fmt, const char *filename, void *logctx, unsigned int offset, unsigned int max_probe_size)=0;
|
|
- virtual void dump_format(AVFormatContext *ic, int index, const char *url, int is_output)=0;
|
|
+ virtual void av_dump_format(AVFormatContext *ic, int index, const char *url, int is_output)=0;
|
|
virtual int url_fopen(AVIOContext **s, const char *filename, int flags)=0;
|
|
virtual int url_fclose(AVIOContext *s)=0;
|
|
virtual int url_open_dyn_buf(AVIOContext **s)=0;
|
|
@@ -140,7 +140,7 @@ public:
|
|
virtual AVInputFormat *av_probe_input_format(AVProbeData *pd, int is_opened) {return ::av_probe_input_format(pd, is_opened); }
|
|
virtual AVInputFormat *av_probe_input_format2(AVProbeData *pd, int is_opened, int *score_max) {*score_max = 100; return ::av_probe_input_format(pd, is_opened); } // Use av_probe_input_format, this is not exported by ffmpeg's headers
|
|
virtual int av_probe_input_buffer(AVIOContext *pb, AVInputFormat **fmt, const char *filename, void *logctx, unsigned int offset, unsigned int max_probe_size) { return ::av_probe_input_buffer(pb, fmt, filename, logctx, offset, max_probe_size); }
|
|
- virtual void dump_format(AVFormatContext *ic, int index, const char *url, int is_output) { ::dump_format(ic, index, url, is_output); }
|
|
+ virtual void av_dump_format(AVFormatContext *ic, int index, const char *url, int is_output) { ::av_dump_format(ic, index, url, is_output); }
|
|
virtual int url_fopen(AVIOContext **s, const char *filename, int flags) { return ::url_fopen(s, filename, flags); }
|
|
virtual int url_fclose(AVIOContext *s) { return ::url_fclose(s); }
|
|
virtual int url_open_dyn_buf(AVIOContext **s) { return ::url_open_dyn_buf(s); }
|
|
@@ -206,7 +206,7 @@ class DllAvFormat : public DllDynamic, DllAvFormatInterface
|
|
int (*p5)(void *opaque, uint8_t *buf, int buf_size),
|
|
int (*p6)(void *opaque, uint8_t *buf, int buf_size),
|
|
offset_t (*p7)(void *opaque, offset_t offset, int whence)))
|
|
- DEFINE_METHOD4(void, dump_format, (AVFormatContext *p1, int p2, const char *p3, int p4))
|
|
+ DEFINE_METHOD4(void, av_dump_format, (AVFormatContext *p1, int p2, const char *p3, int p4))
|
|
DEFINE_METHOD3(int, url_fopen, (AVIOContext **p1, const char *p2, int p3))
|
|
DEFINE_METHOD1(int, url_fclose, (AVIOContext *p1))
|
|
DEFINE_METHOD1(int, url_open_dyn_buf, (AVIOContext **p1))
|
|
@@ -238,7 +238,7 @@ class DllAvFormat : public DllDynamic, DllAvFormatInterface
|
|
RESOLVE_METHOD(av_probe_input_format)
|
|
RESOLVE_METHOD(av_probe_input_format2)
|
|
RESOLVE_METHOD(av_probe_input_buffer)
|
|
- RESOLVE_METHOD(dump_format)
|
|
+ RESOLVE_METHOD(av_dump_format)
|
|
RESOLVE_METHOD(url_fopen)
|
|
RESOLVE_METHOD(url_fclose)
|
|
RESOLVE_METHOD(url_open_dyn_buf)
|
|
diff --git a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
|
|
index f1fad8c..b54b9bc 100644
|
|
--- a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
|
|
+++ b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
|
|
@@ -463,7 +463,7 @@ bool CDVDDemuxFFmpeg::Open(CDVDInputStream* pInput)
|
|
m_pFormatContext->flags |= AVFMT_FLAG_NONBLOCK;
|
|
|
|
// print some extra information
|
|
- m_dllAvFormat.dump_format(m_pFormatContext, 0, strFile.c_str(), 0);
|
|
+ m_dllAvFormat.av_dump_format(m_pFormatContext, 0, strFile.c_str(), 0);
|
|
|
|
UpdateCurrentPTS();
|
|
|