--- xine-lib-1.2.6/src/combined/ffmpeg/ff_audio_decoder.c~	2014-06-09 18:08:42.000000000 +0200
+++ xine-lib-1.2.6/src/combined/ffmpeg/ff_audio_decoder.c	2016-03-21 09:43:09.997831950 +0100
@@ -590,7 +590,7 @@
   int got_frame;
   float gain = this->class->gain;
   if (!this->av_frame)
-    this->av_frame = avcodec_alloc_frame ();
+    this->av_frame = av_frame_alloc();
 
   consumed = avcodec_decode_audio4 (this->context, this->av_frame, &got_frame, &avpkt);
   if ((consumed >= 0) && got_frame) {
@@ -1071,7 +1071,7 @@
   /* try to reset the wma decoder */
   if( this->decoder_ok ) {
 #if AVAUDIO > 3
-    avcodec_free_frame (&this->av_frame);
+    av_frame_free (&this->av_frame);
 #endif
     pthread_mutex_lock (&ffmpeg_lock);
     avcodec_close (this->context);
@@ -1105,7 +1105,7 @@
 
   if( this->context && this->decoder_ok ) {
 #if AVAUDIO > 3
-    avcodec_free_frame (&this->av_frame);
+    av_frame_free (&this->av_frame);
 #endif
     pthread_mutex_lock (&ffmpeg_lock);
     avcodec_close (this->context);
--- xine-lib-1.2.6/src/combined/ffmpeg/ff_video_decoder.c~	2014-06-24 18:21:06.000000000 +0200
+++ xine-lib-1.2.6/src/combined/ffmpeg/ff_video_decoder.c	2016-03-21 09:43:59.951188184 +0100
@@ -2523,7 +2523,7 @@
   this->stream                            = stream;
   this->class                             = (ff_video_class_t *) class_gen;
 
-  this->av_frame          = avcodec_alloc_frame();
+  this->av_frame          = av_frame_alloc();
   this->context           = avcodec_alloc_context();
   this->context->opaque   = this;
 #if AVPALETTE == 1
--- xine-lib-1.2.6/src/dxr3/ffmpeg_encoder.c~	2014-03-13 05:06:09.000000000 +0100
+++ xine-lib-1.2.6/src/dxr3/ffmpeg_encoder.c	2016-03-21 09:53:09.998107003 +0100
@@ -161,7 +161,7 @@
       "dxr3_mpeg_encoder: Couldn't start the ffmpeg library\n");
     return 0;
   }
-  this->picture = avcodec_alloc_frame();
+  this->picture = av_frame_alloc();
   if (!this->picture) {
     xprintf(drv->class->xine, XINE_VERBOSITY_LOG,
       "dxr3_mpeg_encoder: Couldn't allocate ffmpeg frame\n");