diff options
author | Tobias Kortkamp <tobik@FreeBSD.org> | 2018-08-31 08:16:18 +0000 |
---|---|---|
committer | Tobias Kortkamp <tobik@FreeBSD.org> | 2018-08-31 08:16:18 +0000 |
commit | 4ee3a387ce90c6a3c7da89a2ee092730ce926d9b (patch) | |
tree | f80111d8f78611b92c5cb5250a9facec6916a907 /multimedia/libxine/files/patch-ffmpeg3 | |
parent | Fix race condition on setting USES. (diff) |
multimedia/libxine: Update to 1.2.9
- Cleanup options
- Enable IMAGEMAGICK by default
- Make DVB support optional but leave it enabled by default
- Add SNDIO option
- Properly order pkg-plist
- Unbreak on aarch64
- Bump revision of dependent ports [1]
Changes: https://sourceforge.net/projects/xine/files/xine-lib/1.2.9/README.txt/view
ABI: https://abi-laboratory.pro/tracker/timeline/xine-lib/ [1]
PR: 219921
Reported by: emorrasg@yahoo.es
Submitted by: w.schwarzenfeld@utanet.at (initial version), Nathan <ndowens@yahoo.com>
Reviewed by: mat, tobik
Differential Revision: https://reviews.freebsd.org/D16840
Notes
Notes:
svn path=/head/; revision=478529
Diffstat (limited to 'multimedia/libxine/files/patch-ffmpeg3')
-rw-r--r-- | multimedia/libxine/files/patch-ffmpeg3 | 57 |
1 files changed, 0 insertions, 57 deletions
diff --git a/multimedia/libxine/files/patch-ffmpeg3 b/multimedia/libxine/files/patch-ffmpeg3 deleted file mode 100644 index 5f939bac43c4..000000000000 --- a/multimedia/libxine/files/patch-ffmpeg3 +++ /dev/null @@ -1,57 +0,0 @@ -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"); |