From c93a9d37f1e84342e8ef992ecaffac99ab50993f Mon Sep 17 00:00:00 2001
From: bferturk <blacksea8393@gmail.com>
Date: Mon, 13 Jun 2016 23:59:49 +0300
Subject: [PATCH] xine-lib

---
 .../xine-lib/files/xine-lib-ffmpeg3.patch     | 55 +++++++++++++++++++
 multimedia/video/xine-lib/pspec.xml           |  3 +-
 2 files changed, 57 insertions(+), 1 deletion(-)
 create mode 100644 multimedia/video/xine-lib/files/xine-lib-ffmpeg3.patch

diff --git a/multimedia/video/xine-lib/files/xine-lib-ffmpeg3.patch b/multimedia/video/xine-lib/files/xine-lib-ffmpeg3.patch
new file mode 100644
index 0000000000..f0cbc47488
--- /dev/null
+++ b/multimedia/video/xine-lib/files/xine-lib-ffmpeg3.patch
@@ -0,0 +1,55 @@
+Index: xine-lib-1.2.6/src/combined/ffmpeg/ff_audio_decoder.c
+===================================================================
+--- xine-lib-1.2.6.orig/src/combined/ffmpeg/ff_audio_decoder.c
++++ xine-lib-1.2.6/src/combined/ffmpeg/ff_audio_decoder.c
+@@ -590,7 +590,7 @@ static int ff_audio_decode (ff_audio_dec
+   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 @@ static void ff_audio_reset (audio_decode
+   /* 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 @@ static void ff_audio_dispose (audio_deco
+ 
+   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);
+Index: xine-lib-1.2.6/src/combined/ffmpeg/ff_video_decoder.c
+===================================================================
+--- xine-lib-1.2.6.orig/src/combined/ffmpeg/ff_video_decoder.c
++++ xine-lib-1.2.6/src/combined/ffmpeg/ff_video_decoder.c
+@@ -2523,7 +2523,7 @@ static video_decoder_t *ff_video_open_pl
+   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.orig	2016-02-17 07:54:31.950881580 +0000
++++ xine-lib-1.2.6/src/dxr3/ffmpeg_encoder.c	2016-02-17 07:55:42.897237494 +0000
+@@ -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");
diff --git a/multimedia/video/xine-lib/pspec.xml b/multimedia/video/xine-lib/pspec.xml
index 89b7bd7d52..927555cec6 100644
--- a/multimedia/video/xine-lib/pspec.xml
+++ b/multimedia/video/xine-lib/pspec.xml
@@ -64,6 +64,7 @@
             <Patch level="1">tr_segfault_fix.patch</Patch>
             <Patch level="1">deepbind.patch</Patch>
             <Patch level="1">lpthread.patch</Patch>
+            <Patch level="1">xine-lib-ffmpeg3.patch</Patch>
         </Patches>
     </Source>
 
@@ -136,7 +137,7 @@
 
     <History>
         <Update release="2">
-            <Date>2016-06-09</Date>
+            <Date>2016-06-13</Date>
             <Version>1.2.6</Version>
             <Comment>Release Bump</Comment>
             <Name>Pisi Linux Community</Name>