FFmpeg library not found

[assem046]

I've made a patch so you can use ffmpeg >= 0.5.1

Code: Select all

--- audacity-orig/src/FFmpeg.cpp	2010-04-04 22:55:30.390094134 +0200
+++ audacity-new/src/FFmpeg.cpp	2010-04-04 22:59:23.904461441 +0200
@@ -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);
--- audacity-orig/src/FFmpeg.h	2010-04-04 22:55:30.372189264 +0200
+++ audacity-new/src/FFmpeg.h	2010-04-04 22:59:31.131086597 +0200
@@ -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);

[Gale Andrews]

I've made a patch so you can use ffmpeg >= 0.5.1

Thanks. Obviously, others please note that patch will prevent Audacity loading FFmpeg that doesn't use av_match.ext (e.g. it will break an SVN build of FFmpeg from Autumn 2009). Presumably SVN from earlier than 0.5.1 Release date (March 2nd 2010) might actually have the change to av_match ext?



Gale