# Bug#693106: xine-lib: FTBFS with libav 0.9 (from experimental)
# http://www.mail-archive.com/debian-bugs-dist@lists.debian.org/msg1077779.html
--- a/src/combined/ffmpeg/ff_audio_decoder.c
+++ b/src/combined/ffmpeg/ff_audio_decoder.c
@@ -43,6 +43,7 @@
 #include "bswap.h"
 #include "ffmpeg_decoder.h"
 #include "ffmpeg_compat.h"
+#include <libavutil/mem.h>
 
 #define AUDIOBUFSIZE (64 * 1024)
 
--- a/src/combined/ffmpeg/ff_video_decoder.c
+++ b/src/combined/ffmpeg/ff_video_decoder.c
@@ -43,6 +43,7 @@
 #include <xine/xineutils.h>
 #include "ffmpeg_decoder.h"
 #include "ff_mpeg_parser.h"
+#include <libavutil/mem.h>
 
 #ifdef HAVE_FFMPEG_AVUTIL_H
 #  include <postprocess.h>
@@ -258,13 +259,6 @@
   av_frame->linesize[1] = img->pitches[1];
   av_frame->linesize[2] = img->pitches[2];
 
-  /* We should really keep track of the ages of xine frames (see
-   * avcodec_default_get_buffer in libavcodec/utils.c)
-   * For the moment tell ffmpeg that every frame is new (age = bignumber) */
-#ifdef AVFRAMEAGE
-  av_frame->age = 256*256*256*64;
-#endif
-
   av_frame->type= FF_BUFFER_TYPE_USER;
 
   /* take over pts for this frame to have it reordered */