audacity-cvs/ffmpeg.patch

   1 --- FFmpeg.cpp.original    2010-04-14 14:59:48.000000000 +0200
   2 +++ FFmpeg.cpp    2010-04-14 15:25:52.136755669 +0200
   3 @@ -341,7 +341,7 @@
   4           }
   5           // Otherwize, resort to extension matching if available
   6           else if (fmt1->extensions) {
   7 -            if (FFmpegLibsInst->match_ext(filename, fmt1->extensions)) {
   8 +            if (FFmpegLibsInst->av_match_ext(filename, fmt1->extensions)) {
   9                 score = 50;
  10              }
  11           }
  12 @@ -814,7 +814,7 @@
  13     INITDYN(avformat,av_open_input_file);
  14     INITDYN(avformat,av_open_input_stream);
  15     INITDYN(avformat,get_buffer);
  16 -   INITDYN(avformat,match_ext);
  17 +   INITDYN(avformat,av_match_ext);
  18
  19  #if FFMPEG_STABLE
  20     INITDYN(avformat,av_init_packet);
  21 --- FFmpeg.h.original    2010-04-14 14:59:48.000000000 +0200
  22 +++ FFmpeg.h    2010-04-14 15:26:39.932590241 +0200
  23 @@ -222,7 +222,7 @@
  24     AVStream*         (*av_new_stream)                 (AVFormatContext *s, int id);
  25     AVFormatContext*  (*av_alloc_format_context)       (void);
  26     AVOutputFormat*   (*guess_format)                  (const char *short_name, const char *filename, const char *mime_type);
  27 -   int               (*match_ext)                     (const char *filename, const char *extensions);
  28 +   int               (*av_match_ext)                     (const char *filename, const char *extensions);
  29     int               (*av_write_trailer)              (AVFormatContext *s);
  30     int               (*av_interleaved_write_frame)    (AVFormatContext *s, AVPacket *pkt);
  31     int               (*av_write_frame)                (AVFormatContext *s, AVPacket *pkt);