Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xine-lib:add patch

Browse Source
This commit is contained in:
alihanozturk
2016-06-14 00:40:03 +03:00
parent 723e3138d4
commit 7ca6361645
2 changed files with 61 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
multimedia/video/xine-lib/files/xine-lib-ffmpeg3.patch
+55
View File
@@ -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");
multimedia/video/xine-lib/pspec.xml
+6 -5
View File
@@ -29,7 +29,7 @@
<Dependency>libvorbis-devel</Dependency>
<Dependency>mesa-devel</Dependency>
<Dependency>libdvdcss-devel</Dependency>
<Dependency versionFrom="1.7.1">DirectFB-devel</Dependency>
<Dependency>DirectFB-devel</Dependency>
<Dependency>flac-devel</Dependency>
<Dependency>libsdl-devel</Dependency>
<Dependency>alsa-lib-devel</Dependency>
@@ -52,11 +52,12 @@
<!--<Dependency>gconf-devel</Dependency>-->
<Dependency>libSM-devel</Dependency>
<Dependency>libICE-devel</Dependency>
<Dependency versionFrom="0.90">libcdio-devel</Dependency>
<Dependency>libcdio-devel</Dependency>
<Dependency>mesa-glu-devel</Dependency>
<Dependency>libvdpau-devel</Dependency>
</BuildDependencies>
<Patches>
<Patch level="1">xine-lib-ffmpeg3.patch</Patch>
<Patch level="1">list.patch</Patch>
<Patch level="1">multilib.patch</Patch>
<Patch level="1">no_autopoint.patch</Patch>
@@ -95,7 +96,7 @@
<Dependency>libxcb</Dependency>
<Dependency>alsa-lib</Dependency>
<Dependency>freetype</Dependency>
<Dependency versionFrom="1.7.1">DirectFB</Dependency>
<Dependency>DirectFB</Dependency>
<Dependency>libvdpau</Dependency>
<Dependency>mesa-glu</Dependency>
<!--<Dependency>gnome-vfs</Dependency>-->
@@ -136,9 +137,9 @@
<History>
<Update release="2">
<Date>2016-06-09</Date>
<Date>2016-06-14</Date>
<Version>1.2.6</Version>
<Comment>Release Bump</Comment>
<Comment>Release Bump.</Comment>
<Name>Pisi Linux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>