From: Good Guy <good1.2guy@gmail.com>
Date: Tue, 23 Feb 2016 20:04:29 +0000 (-0700)
Subject: update ffmpeg (2.8.4->3.0) giflib,openjpeg,x264,x265
X-Git-Url: https://cinelerra-gg.org/git/?a=commitdiff_plain;h=74084f4d67651fac69f5e5484d57921cb6aa6e1d;p=goodguy%2Fhistory.git

update ffmpeg (2.8.4->3.0) giflib,openjpeg,x264,x265
---

diff --git a/cinelerra-5.0/cinelerra/ffmpeg.C b/cinelerra-5.0/cinelerra/ffmpeg.C
index c0914420..e4949327 100644
--- a/cinelerra-5.0/cinelerra/ffmpeg.C
+++ b/cinelerra-5.0/cinelerra/ffmpeg.C
@@ -54,7 +54,7 @@ FFPacket::FFPacket()
 
 FFPacket::~FFPacket()
 {
-	av_free_packet(&pkt);
+	av_packet_unref(&pkt);
 }
 
 void FFPacket::init()
@@ -754,7 +754,7 @@ int FFVideoStream::load(VFrame *vframe, int64_t pos)
 	}
 	if( ret >= 0 ) {
 		AVCodecContext *ctx = st->codec;
-		ret = convert_cmodel(vframe, (AVPicture *)frame,
+		ret = convert_cmodel(vframe, frame,
 			ctx->pix_fmt, ctx->width, ctx->height);
 	}
 	ret = ret > 0 ? 1 : ret < 0 ? -1 : 0;
@@ -797,7 +797,7 @@ int FFVideoStream::encode(VFrame *vframe)
 		AVFrame *frame = *picture;
 		frame->pts = curr_pos;
 		AVCodecContext *ctx = st->codec;
-		ret = convert_pixfmt(vframe, (AVPicture*)frame,
+		ret = convert_pixfmt(vframe, frame,
 			ctx->pix_fmt, ctx->width, ctx->height);
 	}
 	if( ret >= 0 ) {
@@ -821,7 +821,7 @@ int FFVideoStream::encode_frame(AVPacket *pkt, AVFrame *frame, int &got_packet)
 	return ret;
 }
 
-PixelFormat FFVideoConvert::color_model_to_pix_fmt(int color_model)
+AVPixelFormat FFVideoConvert::color_model_to_pix_fmt(int color_model)
 {
 	switch( color_model ) { 
 	case BC_YUV422:		return AV_PIX_FMT_YUYV422;
@@ -842,7 +842,7 @@ PixelFormat FFVideoConvert::color_model_to_pix_fmt(int color_model)
 	return AV_PIX_FMT_NB;
 }
 
-int FFVideoConvert::pix_fmt_to_color_model(PixelFormat pix_fmt)
+int FFVideoConvert::pix_fmt_to_color_model(AVPixelFormat pix_fmt)
 {
 	switch (pix_fmt) { 
 	case AV_PIX_FMT_YUYV422:	return BC_YUV422;
@@ -864,14 +864,14 @@ int FFVideoConvert::pix_fmt_to_color_model(PixelFormat pix_fmt)
 }
 
 int FFVideoConvert::convert_picture_vframe(VFrame *frame,
-		AVPicture *ip, PixelFormat ifmt, int iw, int ih)
+		AVFrame *ip, AVPixelFormat ifmt, int iw, int ih)
 {
-	AVPicture opic;
+	AVFrame opic;
 	int cmodel = frame->get_color_model();
-	PixelFormat ofmt = color_model_to_pix_fmt(cmodel);
+	AVPixelFormat ofmt = color_model_to_pix_fmt(cmodel);
 	if( ofmt == AV_PIX_FMT_NB ) return -1;
-	int size = avpicture_fill(&opic, frame->get_data(), ofmt, 
-				  frame->get_w(), frame->get_h());
+	int size = av_image_fill_arrays(opic.data, opic.linesize,
+		frame->get_data(), ofmt, frame->get_w(), frame->get_h(), 1);
 	if( size < 0 ) return -1;
 
 	// transfer line sizes must match also
@@ -881,7 +881,7 @@ int FFVideoConvert::convert_picture_vframe(VFrame *frame,
 	if( packed_width != opic.linesize[0] )  return -1;
 
 	if( planar ) {
-		// override avpicture_fill() for planar types
+		// override av_image_fill_arrays() for planar types
 		opic.data[0] = frame->get_y();
 		opic.data[1] = frame->get_u();
 		opic.data[2] = frame->get_v();
@@ -904,7 +904,7 @@ int FFVideoConvert::convert_picture_vframe(VFrame *frame,
 }
 
 int FFVideoConvert::convert_cmodel(VFrame *frame,
-		 AVPicture *ip, PixelFormat ifmt, int iw, int ih)
+		 AVFrame *ip, AVPixelFormat ifmt, int iw, int ih)
 {
 	// try direct transfer
 	if( !convert_picture_vframe(frame, ip, ifmt, iw, ih) ) return 1;
@@ -912,7 +912,7 @@ int FFVideoConvert::convert_cmodel(VFrame *frame,
 	const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(ifmt);
 	int max_bits = 0;
 	for( int i = 0; i <desc->nb_components; ++i ) {
-		int bits = desc->comp[i].depth_minus1 + 1;
+		int bits = desc->comp[i].depth;
 		if( bits > max_bits ) max_bits = bits;
 	}
 // from libavcodec/pixdesc.c
@@ -928,9 +928,9 @@ int FFVideoConvert::convert_cmodel(VFrame *frame,
 }
 
 int FFVideoConvert::transfer_cmodel(VFrame *frame,
-		 AVFrame *ifp, PixelFormat ifmt, int iw, int ih)
+		 AVFrame *ifp, AVPixelFormat ifmt, int iw, int ih)
 {
-	int ret = convert_cmodel(frame, (AVPicture *)ifp, ifmt, iw, ih);
+	int ret = convert_cmodel(frame, ifp, ifmt, iw, ih);
 	if( ret > 0 ) {
 		const AVDictionary *src = av_frame_get_metadata(ifp);
 		AVDictionaryEntry *t = NULL;
@@ -943,14 +943,14 @@ int FFVideoConvert::transfer_cmodel(VFrame *frame,
 }
 
 int FFVideoConvert::convert_vframe_picture(VFrame *frame,
-		AVPicture *op, PixelFormat ofmt, int ow, int oh)
+		AVFrame *op, AVPixelFormat ofmt, int ow, int oh)
 {
-	AVPicture opic;
+	AVFrame opic;
 	int cmodel = frame->get_color_model();
-	PixelFormat ifmt = color_model_to_pix_fmt(cmodel);
+	AVPixelFormat ifmt = color_model_to_pix_fmt(cmodel);
 	if( ifmt == AV_PIX_FMT_NB ) return -1;
-	int size = avpicture_fill(&opic, frame->get_data(), ifmt, 
-				  frame->get_w(), frame->get_h());
+	int size = av_image_fill_arrays(opic.data, opic.linesize,
+		 frame->get_data(), ifmt, frame->get_w(), frame->get_h(), 1);
 	if( size < 0 ) return -1;
 
 	// transfer line sizes must match also
@@ -960,7 +960,7 @@ int FFVideoConvert::convert_vframe_picture(VFrame *frame,
 	if( packed_width != opic.linesize[0] )  return -1;
 
 	if( planar ) {
-		// override avpicture_fill() for planar types
+		// override av_image_fill_arrays() for planar types
 		opic.data[0] = frame->get_y();
 		opic.data[1] = frame->get_u();
 		opic.data[2] = frame->get_v();
@@ -983,7 +983,7 @@ int FFVideoConvert::convert_vframe_picture(VFrame *frame,
 }
 
 int FFVideoConvert::convert_pixfmt(VFrame *frame,
-		 AVPicture *op, PixelFormat ofmt, int ow, int oh)
+		 AVFrame *op, AVPixelFormat ofmt, int ow, int oh)
 {
 	// try direct transfer
 	if( !convert_vframe_picture(frame, op, ofmt, ow, oh) ) return 1;
@@ -1001,9 +1001,9 @@ int FFVideoConvert::convert_pixfmt(VFrame *frame,
 }
 
 int FFVideoConvert::transfer_pixfmt(VFrame *frame,
-		 AVFrame *ofp, PixelFormat ofmt, int ow, int oh)
+		 AVFrame *ofp, AVPixelFormat ofmt, int ow, int oh)
 {
-	int ret = convert_pixfmt(frame, (AVPicture *)ofp, ofmt, ow, oh);
+	int ret = convert_pixfmt(frame, ofp, ofmt, ow, oh);
 	if( ret > 0 ) {
 		BC_Hash *hp = frame->get_params();
 		AVDictionary **dict = avpriv_frame_get_metadatap(ofp);
@@ -2002,19 +2002,8 @@ int FFMPEG::mux_video(FFrame *frm)
 	FFStream *fst = frm->fst;
 	AVFrame *frame = *frm;
 	frame->pts = frm->position;
-	int ret = 1, got_packet = 0;
-	if( fmt_ctx->oformat->flags & AVFMT_RAWPICTURE ) {
-		/* a hack to avoid data copy with some raw video muxers */
-		pkt->flags |= AV_PKT_FLAG_KEY;
-		pkt->stream_index  = fst->st->index;
-		AVPicture *picture = (AVPicture *)frame;
-		pkt->data = (uint8_t *)picture;
-		pkt->size = sizeof(AVPicture);
-		pkt->pts = pkt->dts = frame->pts;
-		got_packet = 1;
-	}
-	else
-		ret = fst->encode_frame(pkt, frame, got_packet);
+	int got_packet = 0;
+	int ret = fst->encode_frame(pkt, frame, got_packet);
 	if( ret >= 0 && got_packet )
 		ret = fst->write_packet(pkt);
 	if( ret < 0 )
@@ -2235,7 +2224,7 @@ int FFVideoStream::create_filter(const char *filter_spec,
 {
 	avfilter_register_all();
 	AVFilter *filter = avfilter_get_by_name(filter_spec);
-	if( !filter || filter->inputs->type != AVMEDIA_TYPE_VIDEO ) {
+	if( !filter || avfilter_pad_get_type(filter->inputs,0) != AVMEDIA_TYPE_VIDEO ) {
 		ff_err(AVERROR(EINVAL), "FFVideoStream::create_filter: %s\n", filter_spec);
 		return -1;
 	}
@@ -2271,7 +2260,7 @@ int FFAudioStream::create_filter(const char *filter_spec,
 {
 	avfilter_register_all();
 	AVFilter *filter = avfilter_get_by_name(filter_spec);
-	if( !filter || filter->inputs->type != AVMEDIA_TYPE_AUDIO ) {
+	if( !filter || avfilter_pad_get_type(filter->inputs,0) != AVMEDIA_TYPE_AUDIO ) {
 		ff_err(AVERROR(EINVAL), "FFAudioStream::create_filter: %s\n", filter_spec);
 		return -1;
 	}
@@ -2366,7 +2355,7 @@ int FFStream::bs_filter(AVPacket *pkt)
 		}
 		if( ret > 0 ) {
 			pkt->side_data = 0;  pkt->side_data_elems = 0;
-			av_free_packet(pkt);
+			av_packet_unref(pkt);
 			ret = av_packet_from_data(&bspkt, data, size);
 			if( ret < 0 ) break;
 		}
diff --git a/cinelerra-5.0/cinelerra/ffmpeg.h b/cinelerra-5.0/cinelerra/ffmpeg.h
index 68649d16..d9ca7836 100644
--- a/cinelerra-5.0/cinelerra/ffmpeg.h
+++ b/cinelerra-5.0/cinelerra/ffmpeg.h
@@ -23,13 +23,14 @@
 #include "vframe.inc"
 
 extern "C" {
-#include "libavfilter/buffersrc.h"
-#include "libavfilter/buffersink.h"
 #include "libavformat/avformat.h"
 #include "libavformat/avio.h"
 #include "libavcodec/avcodec.h"
 #include "libavfilter/avfilter.h"
 #include "libavutil/avutil.h"
+#include "libavfilter/buffersrc.h"
+#include "libavfilter/buffersink.h"
+#include "libavutil/imgutils.h"
 #include "libavutil/opt.h"
 #include "libavutil/pixdesc.h"
 #include "libswresample/swresample.h"
@@ -202,21 +203,21 @@ public:
 	FFVideoConvert() { convert_ctx = 0; }
 	~FFVideoConvert() { if( convert_ctx ) sws_freeContext(convert_ctx); }
 
-	static PixelFormat color_model_to_pix_fmt(int color_model);
-	static int pix_fmt_to_color_model(PixelFormat pix_fmt);
+	static AVPixelFormat color_model_to_pix_fmt(int color_model);
+	static int pix_fmt_to_color_model(AVPixelFormat pix_fmt);
 
 	int convert_picture_vframe(VFrame *frame,
-		AVPicture *ip, PixelFormat ifmt, int iw, int ih);
+		AVFrame *ip, AVPixelFormat ifmt, int iw, int ih);
 	int convert_cmodel(VFrame *frame_out,
-		AVPicture *ip, PixelFormat ifmt, int iw, int ih);
+		AVFrame *ip, AVPixelFormat ifmt, int iw, int ih);
 	int transfer_cmodel(VFrame *frame_in,  //defaults->metadata
-		AVFrame *ifp, PixelFormat ifmt, int iw, int ih);
+		AVFrame *ifp, AVPixelFormat ifmt, int iw, int ih);
 	int convert_vframe_picture(VFrame *frame,
-		AVPicture *op, PixelFormat ofmt, int ow, int oh);
+		AVFrame *op, AVPixelFormat ofmt, int ow, int oh);
 	int convert_pixfmt(VFrame *frame_in,
-		 AVPicture *op, PixelFormat ofmt, int ow, int oh);
+		 AVFrame *op, AVPixelFormat ofmt, int ow, int oh);
 	int transfer_pixfmt(VFrame *frame_in,  //metadata->defaults
-		 AVFrame *ofp, PixelFormat ofmt, int ow, int oh);
+		 AVFrame *ofp, AVPixelFormat ofmt, int ow, int oh);
 };
 
 class FFVideoStream : public FFStream, public FFVideoConvert {
diff --git a/cinelerra-5.0/cinelerra/fileac3.C b/cinelerra-5.0/cinelerra/fileac3.C
index 99ba4e5c..fec8fa66 100644
--- a/cinelerra-5.0/cinelerra/fileac3.C
+++ b/cinelerra-5.0/cinelerra/fileac3.C
@@ -129,7 +129,7 @@ int FileAC3::open_file(int rd, int wr)
 	{
   		//avcodec_init();
 		avcodec_register_all();
-		codec = avcodec_find_encoder(CODEC_ID_AC3);
+		codec = avcodec_find_encoder(AV_CODEC_ID_AC3);
 		if(!codec)
 		{
 			eprintf("FileAC3::open_file codec not found.\n");
diff --git a/cinelerra-5.0/ffmpeg/plugin.opts b/cinelerra-5.0/ffmpeg/plugin.opts
index e47f86f6..1e2b187d 100644
--- a/cinelerra-5.0/ffmpeg/plugin.opts
+++ b/cinelerra-5.0/ffmpeg/plugin.opts
@@ -166,3 +166,15 @@ vflip
 #w3fdif
 #waveform
 #zoompan
+#ametadata
+#anequalizer
+#astreamselect
+#sidechaingate
+#displace
+#maskedmerge
+#metadata
+#nnedi
+#streamselect
+#ahistogram
+#showspectrumpic
+#spectrumsynth
diff --git a/cinelerra-5.0/thirdparty/Makefile b/cinelerra-5.0/thirdparty/Makefile
index 6e3a2323..60c05f73 100644
--- a/cinelerra-5.0/thirdparty/Makefile
+++ b/cinelerra-5.0/thirdparty/Makefile
@@ -118,7 +118,7 @@ ffmpeg.cfg_params= \
 		$(call inc_path,faac,include) \
 		$(call inc_path,twolame,libtwolame) \
 		$(call inc_path,lame,include) \
-		$(call inc_path,openjpeg,src/lib/openmj2) \
+		$(call inc_path,openjpeg,src/lib/openjp2) \
 		$(call inc_path,libvorbis,include) \
 		$(call inc_path,libtheora,include) \
 		$(call inc_path,libvpx) \
@@ -178,8 +178,8 @@ libtheora.ldflags="$(ld_path libvorbis,lib/.libs) $(ld_path libogg,src/.libs)"
 libtheora.cfg_params= --disable-examples --enable-shared=no
 libuuid.cfg_params=--enable-shared=no
 libvorbis.cfg_params= --disable-oggtest --enable-shared=no
-openjpeg.cfg_vars=echo "exec cmake -DBUILD_SHARED_LIBS:BOOL=OFF -DBUILD_MJ2:BOOL=ON ." > ./configure; chmod +x ./configure;
-openjpeg.mak_params= openmj2
+openjpeg.cfg_vars=echo "exec cmake -DBUILD_SHARED_LIBS:BOOL=OFF ." > ./configure; chmod +x ./configure;
+openjpeg.mak_params= ; cd $(call bld_path,openjpeg,src/lib/openjp2); ln -sf . openjpeg-2.1
 opencv.cfg_vars=echo "exec cmake -DBUILD_SHARED_LIBS:BOOL=OFF ." > ./configure; chmod +x ./configure;
 openexr.cfg_vars=LD_LIBRARY_PATH=$(call bld_path,ilmbase,usr/lib)
 openexr.cfg_params=--enable-shared=no
diff --git a/cinelerra-5.0/thirdparty/configure b/cinelerra-5.0/thirdparty/configure
index 0b145773..f529bd23 100755
--- a/cinelerra-5.0/thirdparty/configure
+++ b/cinelerra-5.0/thirdparty/configure
@@ -141,9 +141,9 @@ add_library libjpeg \
 	.libs/libjpeg.a \
 	.libs/libturbojpeg.a \
 	simd/.libs/libsimd.a
-inc_openjpeg="src/lib/openmj2"
+inc_openjpeg="src/lib/openjp2"
 add_library openjpeg \
-	bin/libopenmj2.a
+	bin/libopenjp2.a
 inc_libogg="include"
 add_library libogg \
 	src/.libs/libogg.a
@@ -273,7 +273,7 @@ probe libdv "libdv/dv.h" dv_init -ldv
 probe libiec61883 "libiec61883/iec61883.h" iec61883_mpeg2_recv_init -liec61883
 probe libjpeg "stdio.h unistd.h jpeglib.h" jpeg_start_decompress -ljpeg
 probe libogg "ogg/ogg.h" ogg_stream_init -logg
-probe openjpeg "openjpeg.h" opj_version -lopenmj2 -DOPJ_STATIC || \
+probe openjpeg "openjpeg.h" opj_version -lopenjp2 -DOPJ_STATIC || \
 probe openjpeg "openjpeg-1.5/openjpeg.h" opj_version -lopenjpeg -DOPJ_STATIC || \
 probe openjpeg "openjpeg.h" opj_version -lopenjpeg -DOPJ_STATIC
 probe libraw1394 "libraw1394/raw1394.h" raw1394_iso_recv_init -lraw1394
diff --git a/cinelerra-5.0/thirdparty/downloads.txt b/cinelerra-5.0/thirdparty/downloads.txt
index b37d9f97..94828dc5 100644
--- a/cinelerra-5.0/thirdparty/downloads.txt
+++ b/cinelerra-5.0/thirdparty/downloads.txt
@@ -6,7 +6,7 @@ http://iweb.dl.sourceforge.net/project/libraw1394/libraw1394/libraw1394-2.0.5.ta
 http://libiec61883.sourcearchive.com/downloads/1.2.0-0.1ubuntu3/libiec61883_1.2.0.orig.tar.gz
 http://iweb.dl.sourceforge.net/project/libdv/libdv/1.0.0/libdv-1.0.0.tar.gz
 http://tcpdiag.dl.sourceforge.net/project/libavc1394/libavc1394/libavc1394-0.5.4.tar.gz
-http://iweb.dl.sourceforge.net/project/openjpeg.mirror/2.1.0/openjpeg-2.1.0.tar.gz
+https://github.com/uclouvain/openjpeg/archive/master.zip = openjpeg-2.1.0-20160221.tar.xz
 http://hivelocity.dl.sourceforge.net/project/giflib/giflib-5.1.1.tar.bz2
 http://sourceforge.net/settings/mirror_choices?projectname=flac&filename=flac-src/flac-1.3.1.tar.xz
 http://www.fftw.org/fftw-3.3.4.tar.gz
@@ -16,7 +16,6 @@ http://festvox.org/packed/festival/2.4/voices/festvox_cmu_us_ahw_cg.tar.gz
 http://downloads.sourceforge.net/faac/faac-1.28.tar.bz2
 http://downloads.sourceforge.net/faac/faad2-2.7.tar.bz2
 http://ftp.gnome.org/pub/gnome/sources/esound/0.2/esound-0.2.41.tar.bz2
-http://mirror.karneval.cz/pub/linux/packman/suse/openSUSE_Factory/Essentials/src/xvidcore-1.3.3-1.14.src.rpm
 http://audiofile.68k.org/audiofile-0.3.6.tar.gz
 http://iweb.dl.sourceforge.net/project/libavc1394/libavc1394/libavc1394-0.5.4.tar.gz
 http://colocrossing.dl.sourceforge.net/project/twolame/twolame/0.3.13/twolame-0.3.13.tar.gz
@@ -27,6 +26,6 @@ http://tcpdiag.dl.sourceforge.net/project/lame/lame/3.99/lame-3.99.5.tar.gz
 http://dl.maptools.org/dl/libtiff/tiff-3.8.2.tar.gz
 http://hivelocity.dl.sourceforge.net/project/libuuid/libuuid-1.0.3.tar.gz
 ftp://ftp.videolan.org/pub/x264/snapshots/last_stable_x264.tar.bz2
-https://get.videolan.org/x265/x265_1.7.tar.gz
-http://ffmpeg.org/releases/ffmpeg-2.8.4.tar.bz2
-https://chromium.googlesource.com/webm/libvpx/+archive/cbecf57f3e0d85a7b7f97f3ab7c507f6fe640a93.tar.gz
+https://get.videolan.org/x265/x265_1.9.tar.gz
+http://ffmpeg.org/releases/ffmpeg-3.0.tar.bz2
+https://chromium.googlesource.com/webm/libvpx/+/v1.5.0 = cbecf57f3e0d85a7b7f97f3ab7c507f6fe640a93.tar.gz
diff --git a/cinelerra-5.0/thirdparty/src/ffmpeg-2.8.4.tar.xz b/cinelerra-5.0/thirdparty/src/ffmpeg-2.8.4.tar.xz
deleted file mode 100644
index a7f034f1..00000000
Binary files a/cinelerra-5.0/thirdparty/src/ffmpeg-2.8.4.tar.xz and /dev/null differ
diff --git a/cinelerra-5.0/thirdparty/src/ffmpeg-3.0.tar.xz b/cinelerra-5.0/thirdparty/src/ffmpeg-3.0.tar.xz
new file mode 100644
index 00000000..61e7b57e
Binary files /dev/null and b/cinelerra-5.0/thirdparty/src/ffmpeg-3.0.tar.xz differ
diff --git a/cinelerra-5.0/thirdparty/src/ffmpeg.patch1 b/cinelerra-5.0/thirdparty/src/ffmpeg.patch1
index a1b1c1f3..5f9971e1 100644
--- a/cinelerra-5.0/thirdparty/src/ffmpeg.patch1
+++ b/cinelerra-5.0/thirdparty/src/ffmpeg.patch1
@@ -1,6 +1,6 @@
 --- a/configure	2015-09-10 13:36:03.763986195 -0600
 +++ b/configure	2015-09-10 13:37:25.190550438 -0600
-@@ -5315,7 +5315,9 @@
+@@ -5556,7 +5556,9 @@
                                 die "ERROR: libx264 must be installed and version must be >= 0.118."; } &&
                               { check_cpp_condition x264.h "X264_MPEG2" &&
                                 enable libx262; }
@@ -8,6 +8,6 @@
 +enabled libx265           && { use_pkg_config x265 "stdint.h x265.h" x265_api_get ||
 +                               { require libx265 x265.h x265_encoder_encode -lx265 -lstdc++ &&
 +                                 warn "using libx265 without pkg-config"; } } &&
-                              { check_cpp_condition x265.h "X265_BUILD >= 57" ||
-                                die "ERROR: libx265 version must be >= 57."; }
+                              { check_cpp_condition x265.h "X265_BUILD >= 68" ||
+                                die "ERROR: libx265 version must be >= 68."; }
  enabled libxavs           && require libxavs xavs.h xavs_encoder_encode -lxavs
diff --git a/cinelerra-5.0/thirdparty/src/giflib-5.1.1.tar.xz b/cinelerra-5.0/thirdparty/src/giflib-5.1.1.tar.xz
deleted file mode 100644
index c340e143..00000000
Binary files a/cinelerra-5.0/thirdparty/src/giflib-5.1.1.tar.xz and /dev/null differ
diff --git a/cinelerra-5.0/thirdparty/src/giflib-5.1.2.tar.xz b/cinelerra-5.0/thirdparty/src/giflib-5.1.2.tar.xz
new file mode 100644
index 00000000..88fb3c01
Binary files /dev/null and b/cinelerra-5.0/thirdparty/src/giflib-5.1.2.tar.xz differ
diff --git a/cinelerra-5.0/thirdparty/src/openjpeg-2.1.0-20160221.tar.xz b/cinelerra-5.0/thirdparty/src/openjpeg-2.1.0-20160221.tar.xz
new file mode 100644
index 00000000..09160172
Binary files /dev/null and b/cinelerra-5.0/thirdparty/src/openjpeg-2.1.0-20160221.tar.xz differ
diff --git a/cinelerra-5.0/thirdparty/src/openjpeg-2.1.0.tar.xz b/cinelerra-5.0/thirdparty/src/openjpeg-2.1.0.tar.xz
deleted file mode 100644
index 8ecdb38f..00000000
Binary files a/cinelerra-5.0/thirdparty/src/openjpeg-2.1.0.tar.xz and /dev/null differ
diff --git a/cinelerra-5.0/thirdparty/src/x264-20151229.tar.xz b/cinelerra-5.0/thirdparty/src/x264-20151229.tar.xz
deleted file mode 100644
index f63422f4..00000000
Binary files a/cinelerra-5.0/thirdparty/src/x264-20151229.tar.xz and /dev/null differ
diff --git a/cinelerra-5.0/thirdparty/src/x264-20160221.tar.xz b/cinelerra-5.0/thirdparty/src/x264-20160221.tar.xz
new file mode 100644
index 00000000..5c66aa97
Binary files /dev/null and b/cinelerra-5.0/thirdparty/src/x264-20160221.tar.xz differ
diff --git a/cinelerra-5.0/thirdparty/src/x265.patch1 b/cinelerra-5.0/thirdparty/src/x265.patch1
index dde859d8..538df807 100644
--- a/cinelerra-5.0/thirdparty/src/x265.patch1
+++ b/cinelerra-5.0/thirdparty/src/x265.patch1
@@ -1,6 +1,7 @@
---- a/source/encoder/encoder.cpp	2016-02-01 08:55:44.815838396 -0700
-+++ b/source/encoder/encoder.cpp	2016-02-01 08:56:25.355766065 -0700
-@@ -318,7 +318,10 @@
+diff -ru a/source/encoder/encoder.cpp b/source/encoder/encoder.cpp
+--- a/source/encoder/encoder.cpp	2016-01-24 22:16:50.000000000 -0700
++++ b/source/encoder/encoder.cpp	2016-02-21 09:02:20.443636332 -0700
+@@ -361,7 +361,10 @@
      }
  
      if (m_threadPool)
diff --git a/cinelerra-5.0/thirdparty/src/x265_1.7.tar.xz b/cinelerra-5.0/thirdparty/src/x265_1.7.tar.xz
deleted file mode 100644
index e249431f..00000000
Binary files a/cinelerra-5.0/thirdparty/src/x265_1.7.tar.xz and /dev/null differ
diff --git a/cinelerra-5.0/thirdparty/src/x265_1.9.tar.xz b/cinelerra-5.0/thirdparty/src/x265_1.9.tar.xz
new file mode 100644
index 00000000..7f1cbfda
Binary files /dev/null and b/cinelerra-5.0/thirdparty/src/x265_1.9.tar.xz differ