Attachment 169339 Details for Bug 208817 – Patch to fix build of multimedia/libxine using ffmpeg 3.0.x

[patch] Patch to fix build of multimedia/libxine using ffmpeg 3.0.x

libxine.diff (text/plain), 2.95 KB, created by Ben Woods on 2016-04-15 15:16:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ben Woods

Created: 2016-04-15 15:16:46 UTC

Size: 2.95 KB

patch

obsolete

>Index: multimedia/libxine/files/patch-ffmpeg3
>===================================================================
>--- multimedia/libxine/files/patch-ffmpeg3	(nonexistent)
>+++ multimedia/libxine/files/patch-ffmpeg3	(working copy)
>@@ -0,0 +1,57 @@
>+Index: src/combined/ffmpeg/ff_audio_decoder.c
>+===================================================================
>+--- xine-lib-1.2.6.orig/src/combined/ffmpeg/ff_audio_decoder.c
>++++ 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: src/combined/ffmpeg/ff_video_decoder.c
>+===================================================================
>+--- xine-lib-1.2.6.orig/src/combined/ffmpeg/ff_video_decoder.c
>++++ 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
>+Index: src/dxr3/ffmpeg_encoder.c
>+===================================================================
>+--- src/dxr3/ffmpeg_encoder.c.orig	2016-02-17 07:54:31.950881580 +0000
>++++ 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");
>
>Property changes on: multimedia/libxine/files/patch-ffmpeg3
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Flags:

woodsb02: maintainer-approval+

Actions: View | Diff

Attachments on bug 208817: 169339 | 169340