forked from pool/audacity
36 lines
1.7 KiB
Diff
36 lines
1.7 KiB
Diff
|
Index: src/FFmpeg.cpp
|
||
|
|
===================================================================
|
||
|
|
--- src/FFmpeg.cpp.orig
|
||
|
|
+++ src/FFmpeg.cpp
|
||
|
|
@@ -356,7 +356,7 @@ int ufile_fopen_input(AVFormatContext **
|
||
|
|
}
|
||
|
|
// Otherwize, resort to extension matching if available
|
||
|
|
else if (fmt1->extensions) {
|
||
|
|
- if (FFmpegLibsInst->match_ext(filename, fmt1->extensions)) {
|
||
|
|
+ if (FFmpegLibsInst->av_match_ext(filename, fmt1->extensions)) {
|
||
|
|
score = 50;
|
||
|
|
}
|
||
|
|
}
|
||
|
|
@@ -829,7 +829,7 @@ bool FFmpegLibs::InitLibs(wxString libpa
|
||
|
|
INITDYN(avformat,av_open_input_file);
|
||
|
|
INITDYN(avformat,av_open_input_stream);
|
||
|
|
INITDYN(avformat,get_buffer);
|
||
|
|
- INITDYN(avformat,match_ext);
|
||
|
|
+ INITDYN(avformat,av_match_ext);
|
||
|
|
|
||
|
|
#if FFMPEG_STABLE
|
||
|
|
INITDYN(avformat,av_init_packet);
|
||
|
|
Index: src/FFmpeg.h
|
||
|
|
===================================================================
|
||
|
|
--- src/FFmpeg.h.orig
|
||
|
|
+++ src/FFmpeg.h
|
||
|
|
@@ -224,7 +224,7 @@ public:
|
||
|
|
AVStream* (*av_new_stream) (AVFormatContext *s, int id);
|
||
|
|
AVFormatContext* (*av_alloc_format_context) (void);
|
||
|
|
AVOutputFormat* (*guess_format) (const char *short_name, const char *filename, const char *mime_type);
|
||
|
|
- int (*match_ext) (const char *filename, const char *extensions);
|
||
|
|
+ int (*av_match_ext) (const char *filename, const char *extensions);
|
||
|
|
int (*av_write_trailer) (AVFormatContext *s);
|
||
|
|
int (*av_interleaved_write_frame) (AVFormatContext *s, AVPacket *pkt);
|
||
|
|
int (*av_write_frame) (AVFormatContext *s, AVPacket *pkt);
|