--- src/plugins/ffmpeg/ffmpeg.cpp.orig	2009-05-29 20:12:09.000000000 +0000
+++ src/plugins/ffmpeg/ffmpeg.cpp	2009-05-29 20:10:01.000000000 +0000
@@ -1021,19 +1021,9 @@
         if (subtitle_to_free) {
             if (subtitle_to_free->rects != NULL) {
                 for (i = 0; i < subtitle_to_free->num_rects; i++) {
-									
-#ifndef LIBAVCODEC_VERSION_MINOR
-#define LIBAVCODEC_VERSION_MINOR 0
-#endif
-
-#if LIBAVCODEC_VERSION_MINOR >= 11
-                    av_freep(subtitle_to_free->rects[i]->pict.data[0]);
-                    av_freep(subtitle_to_free->rects[i]->pict.data[1]);
-                    av_freep(subtitle_to_free->rects[i]);
-#else
-                    av_free(subtitle_to_free->rects[i].bitmap);
-                    av_free(subtitle_to_free->rects[i].rgba_palette);									
-#endif
+		av_freep(&subtitle_to_free->rects[i]->pict.data[0]);
+		av_freep(&subtitle_to_free->rects[i]->pict.data[1]);
+		av_freep(&subtitle_to_free->rects[i]);
                 }
                 av_freep(&subtitle_to_free->rects);
             }