Index: src/FFmpeg.h
--- src/FFmpeg.h.orig
+++ src/FFmpeg.h
@@ -333,17 +333,17 @@ class FFmpegLibs (public)
 
    wxString GetLibAVFormatName()
    {
-      return (wxT("libavformat.so.") wxT(AV_STRINGIFY(LIBAVFORMAT_VERSION_MAJOR)));
+      return (wxT("libavformat.so"));
    }
 
    wxString GetLibAVCodecName()
    {
-      return (wxT("libavcodec.so.") wxT(AV_STRINGIFY(LIBAVCODEC_VERSION_MAJOR)));
+      return (wxT("libavcodec.so"));
    }
 
    wxString GetLibAVUtilName()
    {
-      return (wxT("libavutil.so.") wxT(AV_STRINGIFY(LIBAVUTIL_VERSION_MAJOR)));
+      return (wxT("libavutil.so"));
    }
 #endif // (__WXMAC__) || (__WXMSW__)
 
@@ -685,7 +685,7 @@ extern "C" {
    FFMPEG_FUNCTION_WITH_RETURN(
       AVOutputFormat*,
       av_oformat_next,
-      (AVOutputFormat *f),
+      (const AVOutputFormat *f),
       (f)
    );
 #endif
@@ -766,7 +766,7 @@ extern "C" {
    FFMPEG_FUNCTION_WITH_RETURN(
       int,
       av_fifo_size,
-      (AVFifoBuffer *f),
+      (const AVFifoBuffer *f),
       (f)
    );
 #endif
@@ -828,7 +828,7 @@ extern "C" {
    FFMPEG_FUNCTION_WITH_RETURN(
       AVDictionaryEntry *,
       av_dict_get,
-      (AVDictionary *m, const char *key, const AVDictionaryEntry *prev, int flags),
+      (const AVDictionary *m, const char *key, const AVDictionaryEntry *prev, int flags),
       (m, key, prev, flags)
    );
 #endif
