SHA256
1
0
forked from pool/audacity
audacity/audacity-ffmpeg_match_ext.patch
Pavol Rusnak 7d1c83f21c Accepting request 40703 from home:RedDwarf:branches:multimedia:apps
Copy from home:RedDwarf:branches:multimedia:apps/audacity via accept of submit request 40703 revision 4.
Request was accepted with message:
Reviewed ok

OBS-URL: https://build.opensuse.org/request/show/40703
OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/audacity?expand=0&rev=40
2010-05-27 09:59:25 +00:00

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);