summaryrefslogtreecommitdiff
path: root/audio/audacity/audacity-src-1.3.12-beta-avformat-api-change.patch
blob: e6e8315598de092407bd9d8ff8604ce672cd0d8e (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
diff -p -up audacity-src-1.3.12-beta/src/FFmpeg.cpp~ audacity-src-1.3.12-beta/src/FFmpeg.cpp
--- audacity-src-1.3.12-beta/src/FFmpeg.cpp~	2010-03-30 13:28:54.000000000 +0200
+++ audacity-src-1.3.12-beta/src/FFmpeg.cpp	2010-05-07 11:17:29.000000000 +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);
diff -p -up audacity-src-1.3.12-beta/src/FFmpeg.h~ audacity-src-1.3.12-beta/src/FFmpeg.h
--- audacity-src-1.3.12-beta/src/FFmpeg.h~	2010-03-30 13:28:54.000000000 +0200
+++ audacity-src-1.3.12-beta/src/FFmpeg.h	2010-05-07 11:17:45.000000000 +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);