diff options
Diffstat (limited to 'community/vlc/vlc-2.2.4-ffmpeg3-1.patch')
| -rw-r--r-- | community/vlc/vlc-2.2.4-ffmpeg3-1.patch | 193 |
1 files changed, 0 insertions, 193 deletions
diff --git a/community/vlc/vlc-2.2.4-ffmpeg3-1.patch b/community/vlc/vlc-2.2.4-ffmpeg3-1.patch deleted file mode 100644 index 62e93676b4..0000000000 --- a/community/vlc/vlc-2.2.4-ffmpeg3-1.patch +++ /dev/null @@ -1,193 +0,0 @@ -Fixed by @Vaelatern to modify configure.am instead of configure, - and to use -p0 instead of -p1 -http://www.linuxfromscratch.org/patches/blfs/svn/vlc-2.2.4-ffmpeg3-1.patch -Submitted By: Armin K <krejzi au email do com> -Date: 2016-05-06 -Initial Package Version: 2.2.3 -Upstream Status: Committed -Origin: Upstream -Description: Fixes building against ffmpeg3 - Rediffed for version 2.2.3 by Bruce Dubbs - -diff -Naur configure configure ---- a/configure.ac 2016-09-21 17:28:06.168721882 -0400 -+++ b/configure.ac 2016-09-21 17:30:16.529223098 -0400 -@@ -2323,8 +2323,8 @@ - [ --enable-avcodec libavcodec codec (default enabled)]) - AS_IF([test "${enable_avcodec}" != "no"], [ - PKG_CHECK_MODULES(AVCODEC,[libavcodec >= 53.34.0 libavutil >= 51.22.0], [ -- PKG_CHECK_EXISTS([libavutil < 55],, [ -- AC_MSG_ERROR([libavutil versions 55 and later are not supported.]) -+ PKG_CHECK_EXISTS([libavutil > 55],, [ -+ AC_MSG_ERROR([libavutil versions 55 and before are not supported.]) - ]) - VLC_SAVE_FLAGS - CPPFLAGS="${CPPFLAGS} ${AVCODEC_CFLAGS}" -@@ -2382,8 +2382,8 @@ - AS_IF([test "${have_vaapi}" = "yes" -a "${have_avcodec}" = "yes"], [ - case "${avfork}" in - ffmpeg) -- PKG_CHECK_EXISTS([libavcodec >= 57.10.100], [ -- AC_MSG_ERROR([VA API requires FFmpeg libavcodec < 57.10 or libav.]) -+ PKG_CHECK_EXISTS([libavcodec <= 57.10.100], [ -+ AC_MSG_ERROR([VA API requires FFmpeg libavcodec > 57.10 or libav.]) - ]) - ;; - esac -@@ -2416,8 +2416,8 @@ - AS_IF([test "x${have_avcodec}" = "xyes"], [ - case "${avfork}" in - ffmpeg) -- PKG_CHECK_EXISTS([libavcodec >= 57.10.100], [ -- AC_MSG_ERROR([DXVA2 requires FFmpeg libavcodec < 57.10 or libav.]) -+ PKG_CHECK_EXISTS([libavcodec <= 57.10.100], [ -+ AC_MSG_ERROR([DXVA2 requires FFmpeg libavcodec > 57.10 or libav.]) - ]) - ;; - esac -@@ -3180,7 +3180,7 @@ - case "${avfork}" in - libav) av_vdpau_ver="55.26.0" ;; - ffmpeg) av_vdpau_ver="55.42.100" -- PKG_CHECK_EXISTS([libavcodec >= 57.10.100], [ -+ PKG_CHECK_EXISTS([libavcodec <= 57.10.100], [ - AC_MSG_ERROR([VDPAU requires FFmpeg libavcodec < 57.10 or libav.]) - ]) - ;; - ---- a/modules/codec/avcodec/audio.c 2015-12-08 10:18:56.000000000 -0600 -+++ b/modules/codec/avcodec/audio.c 2016-05-06 22:39:24.859030920 -0500 -@@ -36,12 +36,11 @@ - #include <vlc_codec.h> - #include <vlc_avcodec.h> - -+#include "avcodec.h" -+ - #include <libavcodec/avcodec.h> - #include <libavutil/mem.h> - --#include <libavutil/audioconvert.h> -- --#include "avcodec.h" - - /***************************************************************************** - * decoder_sys_t : decoder descriptor -diff -Naur modules/codec/avcodec/avcommon_compat.h modules/codec/avcodec/avcommon_compat.h ---- a/modules/codec/avcodec/avcommon_compat.h 2015-03-01 08:07:35.000000000 -0600 -+++ b/modules/codec/avcodec/avcommon_compat.h 2016-05-06 22:39:24.859030920 -0500 -@@ -506,6 +506,15 @@ - - #endif /* HAVE_LIBAVUTIL_AVUTIL_H */ - -+#if LIBAVUTIL_VERSION_MAJOR >= 55 -+# define FF_API_AUDIOCONVERT 1 -+#endif -+ -+/* libavutil/pixfmt.h */ -+#ifndef PixelFormat -+# define PixelFormat AVPixelFormat -+#endif -+ - #ifdef HAVE_LIBAVFORMAT_AVFORMAT_H - # include <libavformat/avformat.h> - -diff -Naur modules/codec/avcodec/encoder.c modules/codec/avcodec/encoder.c ---- a/modules/codec/avcodec/encoder.c 2015-10-21 11:36:45.000000000 -0500 -+++ b/modules/codec/avcodec/encoder.c 2016-05-06 22:39:24.860030887 -0500 -@@ -41,7 +41,6 @@ - #include <vlc_cpu.h> - - #include <libavcodec/avcodec.h> --#include <libavutil/audioconvert.h> - - #include "avcodec.h" - #include "avcommon.h" -@@ -311,7 +310,7 @@ - else if( !GetFfmpegCodec( p_enc->fmt_out.i_codec, &i_cat, &i_codec_id, - &psz_namecodec ) ) - { -- if( FindFfmpegChroma( p_enc->fmt_out.i_codec ) == PIX_FMT_NONE ) -+ if( FindFfmpegChroma( p_enc->fmt_out.i_codec ) == AV_PIX_FMT_NONE ) - return VLC_EGENERIC; /* handed chroma output */ - - i_cat = VIDEO_ES; -@@ -1017,7 +1016,7 @@ - } - } - -- p_sys->frame = avcodec_alloc_frame(); -+ p_sys->frame = av_frame_alloc(); - if( !p_sys->frame ) - { - goto error; -@@ -1088,7 +1087,8 @@ - AVFrame *frame = NULL; - if( likely(p_pict) ) { - frame = p_sys->frame; -- avcodec_get_frame_defaults( frame ); -+ av_frame_unref( frame ); -+ - for( i_plane = 0; i_plane < p_pict->i_planes; i_plane++ ) - { - p_sys->frame->data[i_plane] = p_pict->p[i_plane].p_pixels; -@@ -1329,7 +1329,7 @@ - //How much we need to copy from new packet - const int leftover = leftover_samples * p_sys->p_context->channels * p_sys->i_sample_bytes; - -- avcodec_get_frame_defaults( p_sys->frame ); -+ av_frame_unref( p_sys->frame ); - p_sys->frame->format = p_sys->p_context->sample_fmt; - p_sys->frame->nb_samples = leftover_samples + p_sys->i_samples_delay; - -@@ -1451,7 +1451,8 @@ - while( ( p_aout_buf->i_nb_samples >= p_sys->i_frame_size ) || - ( p_sys->b_variable && p_aout_buf->i_nb_samples ) ) - { -- avcodec_get_frame_defaults( p_sys->frame ); -+ av_frame_unref( p_sys->frame ); -+ - if( p_sys->b_variable ) - p_sys->frame->nb_samples = p_aout_buf->i_nb_samples; - else -diff -Naur modules/codec/avcodec/vaapi.c modules/codec/avcodec/vaapi.c ---- a/modules/codec/avcodec/vaapi.c 2014-11-16 12:57:58.000000000 -0600 -+++ b/modules/codec/avcodec/vaapi.c 2016-05-06 22:39:24.860030887 -0500 -@@ -595,7 +595,7 @@ - return err; - - /* Only VLD supported */ -- p_va->pix_fmt = PIX_FMT_VAAPI_VLD; -+ p_va->pix_fmt = AV_PIX_FMT_VAAPI_VLD; - p_va->setup = Setup; - p_va->get = Get; - p_va->release = Release; -diff -Naur modules/codec/avcodec/video.c modules/codec/avcodec/video.c ---- a/modules/codec/avcodec/video.c 2016-04-04 19:45:24.000000000 -0500 -+++ b/modules/codec/avcodec/video.c 2016-05-06 22:39:24.860030887 -0500 -@@ -234,7 +234,7 @@ - p_sys->p_codec = p_codec; - p_sys->i_codec_id = i_codec_id; - p_sys->psz_namecodec = psz_namecodec; -- p_sys->p_ff_pic = avcodec_alloc_frame(); -+ p_sys->p_ff_pic = av_frame_alloc(); - p_sys->b_delayed_open = true; - p_sys->p_va = NULL; - vlc_sem_init( &p_sys->sem_mt, 0 ); -@@ -446,7 +446,7 @@ - if( ffmpeg_OpenCodec( p_dec ) < 0 ) - { - msg_Err( p_dec, "cannot open codec (%s)", p_sys->psz_namecodec ); -- avcodec_free_frame( &p_sys->p_ff_pic ); -+ av_frame_free( &p_sys->p_ff_pic ); - vlc_sem_destroy( &p_sys->sem_mt ); - free( p_sys ); - return VLC_EGENERIC; -@@ -826,7 +826,7 @@ - wait_mt( p_sys ); - - if( p_sys->p_ff_pic ) -- avcodec_free_frame( &p_sys->p_ff_pic ); -+ av_frame_free( &p_sys->p_ff_pic ); - - if( p_sys->p_va ) - vlc_va_Delete( p_sys->p_va ); |