Hello community, here is the log from the commit of package ffmpeg for openSUSE:Factory checked in at 2016-08-26 23:15:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ffmpeg (Old) and /work/SRC/openSUSE:Factory/.ffmpeg.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ffmpeg" Changes: -------- --- /work/SRC/openSUSE:Factory/ffmpeg/ffmpeg.changes 2016-02-12 11:21:20.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ffmpeg.new/ffmpeg.changes 2016-08-26 23:15:49.000000000 +0200 @@ -1,0 +2,199 @@ +Tue Aug 9 07:34:10 UTC 2016 - aloi...@gmx.com + +- Update to version 3.1.2: + * avcodec/rawdec: Fix palette handling with changing + palettes + * avcodec/raw: Fix decoding of ilacetest.mov + * avformat/mov: Enable mp3 parsing if a packet needs it + * avformat/hls: Sync starting segment across variants on + live streams + * avformat/hls: Fix regression with ranged media segments + * avcodec/ffv1enc: Fix assertion failure with non zero + bits per sample + * avfilter/af_hdcd: small fix in af_hdcd.c where gain was + not being adjusted for "attenuate slowly" + * avformat/oggdec: Fix integer overflow with invalid pts + * libavcodec/dnxhd: Enable 12-bit DNxHR support. + * lavc/vaapi_encode_h26x: Fix a crash if "." is not the + decimal separator. + * avcodec/vp9_parser: Check the input frame sizes for + being consistent + * avformat/flvdec: parse keyframe before a/v stream was + created add_keyframes_index() when stream created or + keyframe parsed + * libavformat/rtpdec_asf: zero initialize the AVIOContext + struct + * libx264: Increase x264 opts character limit to 4096 + * avcodec/h264_parser: Set sps/pps_ref + * librtmp: Avoid an infinite loop setting connection + arguments + * avformat/oggparsevp8: fix pts calculation on pages + ending with an invisible frame + * lavf/vplayerdec: Improve auto-detection. + * lavc/mediacodecdec_h264: properly convert extradata to + annex-b + +------------------------------------------------------------------- +Fri Jul 29 09:25:52 UTC 2016 - jeng...@inai.de + +- Build with netcdf so as to enable af_sofalizer [boo#983398] + +------------------------------------------------------------------- +Fri Jul 1 06:17:49 UTC 2016 - aloi...@gmx.com + +- Update to version 3.1.1 + * doc/APIchanges: document the lavu/lavf field moves + * avformat/avformat: Move new field to the end of AVStream + * avformat/utils: update deprecated AVStream->codec when the context is updated + * avutil/frame: Move new field to the end of AVFrame + * libavcodec/exr : fix decoding piz float file. + * avformat/mov: Check sample size + * lavfi: Move new field to the end of AVFilterContext + * lavfi: Move new field to the end of AVFilterLink + * ffplay: Fix usage of private lavfi API + * lavc/mediacodecdec_h264: add missing NAL headers to SPS/PPS buffers + * lavc/pnm_parser: disable parsing for text based PNMs + +------------------------------------------------------------------- +Mon Jun 27 06:20:03 UTC 2016 - aloi...@gmx.com + +- Update to version 3.1 + * DXVA2-accelerated HEVC Main10 decoding + * fieldhint filter + * loop video filter and aloop audio filter + * Bob Weaver deinterlacing filter + * firequalizer filter + * datascope filter + * bench and abench filters + * ciescope filter + * protocol blacklisting API + * MediaCodec H264 decoding + * VC-2 HQ RTP payload format (draft v1) depacketizer and + packetizer + * VP9 RTP payload format (draft v2) packetizer + * AudioToolbox audio decoders + * AudioToolbox audio encoders + * coreimage filter (GPU based image filtering on OSX) + * libdcadec removed + * bitstream filter for extracting DTS core + * ADPCM IMA DAT4 decoder + * musx demuxer + * aix demuxer + * remap filter + * hash and framehash muxers + * colorspace filter + * hdcd filter + * readvitc filter + * VAAPI-accelerated format conversion and scaling + * libnpp/CUDA-accelerated format conversion and scaling + * Duck TrueMotion 2.0 Real Time decoder + * Wideband Single-bit Data (WSD) demuxer + * VAAPI-accelerated H.264/HEVC/MJPEG encoding + * DTS Express (LBR) decoder + * Generic OpenMAX IL encoder with support for Raspberry Pi + * IFF ANIM demuxer & decoder + * Direct Stream Transfer (DST) decoder + * loudnorm filter + * MTAF demuxer and decoder + * MagicYUV decoder + * OpenExr improvements (tile data and B44/B44A support) + * BitJazz SheerVideo decoder + * CUDA CUVID H264/HEVC decoder + * 10-bit depth support in native utvideo decoder + * libutvideo wrapper removed + * YUY2 Lossless Codec decoder + +- Added minimum requirement for libva (0.35.0, matched by + 1.3.0 package) + +------------------------------------------------------------------- +Tue May 31 08:31:36 UTC 2016 - robert.munte...@gmail.com + +- Guard usage of opencore using bcond_with, boo#980542 + +------------------------------------------------------------------- +Thu Apr 28 06:29:57 UTC 2016 - aloi...@gmx.com + +- Update to version 3.0.2 + * avcodec/ttaenc: Reallocate packet if its too small + * configure: build fix for P5600 with mips code restructuring + * mips: add support for R6 + * pgssubdec: fix subpicture output colorspace and range + * avcodec/ac3dec: Reset SPX when switching from EAC3 to AC3 + * avfilter/vf_drawtext: Check return code of load_glyph() + * avformat/mux: Check that deinit is set before calling it + * avcodec/takdec: add code that got somehow lost in process of + REing + * avcodec/apedec: fix decoding of stereo files with one + channel full of silence + * avcodec/avpacket: Fix off by 5 error + * avcodec/h264: Fix for H.264 configuration parsing + * avcodec/bmp_parser: Ensure remaining_size is not too small + in startcode packet crossing corner case + * avcodec/pngdec: Fix alpha detection with skip_frame + * Changelog: Make formating consistent + * avfilter/src_movie: fix how we check for overflows with + seek_point + * avcodec/j2kenc: Add attribution to OpenJPEG project: + +- Dropped dcadec (libdca was merged upstream) + +------------------------------------------------------------------- +Mon Apr 25 06:39:32 UTC 2016 - jeng...@inai.de + +- Add ffmpeg-codec-choice.diff + +------------------------------------------------------------------- +Sun Apr 17 22:13:21 UTC 2016 - o...@aepfle.de + +- Remove ffmpeg-devel subpackage. + All users have been converted to pkgconfig + Add Provides/Obsoletes to libavdevice-devel + +------------------------------------------------------------------- +Sun Apr 10 21:51:14 UTC 2016 - jeng...@inai.de + +- Add ffmpeg-new-coder-errors.diff + +------------------------------------------------------------------- +Wed Apr 6 18:57:05 UTC 2016 - jeng...@inai.de + +- Another try at organizing the codec-enable list. + Enable video: AYUV, Dirac, MJPEG, rawvideo, Theora, VP8, VP9, WebP, + zlib + Enable audio: Celt, GSM, Opus, Speex, Vorbis + Enable subtitle: ASS/SSA text, SRT text, UTF-8 plaintext + +------------------------------------------------------------------- +Wed Mar 30 00:47:30 UTC 2016 - jeng...@inai.de + +- Update to new maintenance release 3.0.1 +* vc2enc: fix use of uninitialized variables in the rate control + system +* postproc: fix an unaligned access +* lavc/hevc: Allow arbitrary garbage in bytestream as long as at + least one NAL unit is found. + +------------------------------------------------------------------- +Tue Feb 16 16:36:09 UTC 2016 - o...@aepfle.de + +- Update included pkgconfig files to require the exact version + of ffmpeg pc files, instead of any later version + ffmpeg-pkgconfig-version.patch + +------------------------------------------------------------------- +Mon Feb 15 12:57:55 UTC 2016 - idon...@suse.com + +- Remove the optional vo-aacenc dependency, upstream removed it. + +------------------------------------------------------------------- +Mon Feb 15 11:54:46 UTC 2016 - jeng...@inai.de + +- Update to new upstream release 3.0 +* New filters: extrastereo, ocr, alimiter, stereowiden, stereotools, + rubberband, tremolo, agate, chromakey, displace, and many more. +* ffplay dynamic volume control +* audio high-order multiband parametric equalizer +* automatic bitstream filtering ++++ 2 more lines (skipped) ++++ between /work/SRC/openSUSE:Factory/ffmpeg/ffmpeg.changes ++++ and /work/SRC/openSUSE:Factory/.ffmpeg.new/ffmpeg.changes Old: ---- ffmpeg-2.8.6.tar.bz2 ffmpeg-2.8.6.tar.bz2.asc New: ---- enable_decoders enable_demuxers enable_encoders enable_muxers ffmpeg-3.1.2.tar.xz ffmpeg-3.1.2.tar.xz.asc ffmpeg-codec-choice.diff ffmpeg-new-coder-errors.diff ffmpeg-pkgconfig-version.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ffmpeg.spec ++++++ --- /var/tmp/diff_new_pack.loJafG/_old 2016-08-26 23:15:51.000000000 +0200 +++ /var/tmp/diff_new_pack.loJafG/_new 2016-08-26 23:15:51.000000000 +0200 @@ -16,7 +16,6 @@ # -%bcond_with dcadec %bcond_with lame %bcond_with librtmp %bcond_with twolame @@ -24,6 +23,7 @@ %bcond_with x264 %bcond_with x265 %bcond_with xvid +%bcond_with opencore %bcond_without celt %bcond_without libass %bcond_without libva @@ -32,24 +32,28 @@ %bcond_without webp Name: ffmpeg -Version: 2.8.6 +Version: 3.1.2 Release: 0 -Summary: Library working with various multimedia formats +Summary: Library for working with various multimedia formats License: LGPL-2.1+ and GPL-2.0+ Group: Productivity/Multimedia/Video/Editors and Convertors Url: https://ffmpeg.org/ + #Freshcode-URL: http://freshcode.club/projects/ffmpeg #Git-Clone: git://source.ffmpeg.org/ffmpeg -Source: https://www.ffmpeg.org/releases/%name-%version.tar.bz2 -Source2: https://www.ffmpeg.org/releases/%name-%version.tar.bz2.asc +Source: https://www.ffmpeg.org/releases/%name-%version.tar.xz +Source2: https://www.ffmpeg.org/releases/%name-%version.tar.xz.asc Source3: ffmpeg-rpmlintrc +Source4: enable_decoders +Source5: enable_encoders +Source6: enable_demuxers +Source7: enable_muxers Source99: baselibs.conf Patch1: ffmpeg-libcdio_cdda-pkgconfig.patch Patch2: ffmpeg-2.4.5-arm6l.patch -# -Provides: ffmpeg-tools = %{version} -Obsoletes: ffmpeg-tools < %{version} -# +Patch3: ffmpeg-pkgconfig-version.patch +Patch4: ffmpeg-new-coder-errors.diff +Patch5: ffmpeg-codec-choice.diff BuildRequires: ladspa-devel BuildRequires: libgsm-devel BuildRequires: pkg-config @@ -79,11 +83,12 @@ BuildRequires: pkgconfig(libpulse) BuildRequires: pkgconfig(libraw1394) %if %{with libva} -BuildRequires: pkgconfig(libva) +BuildRequires: pkgconfig(libva) >= 0.35.0 %endif %if %{with webp} BuildRequires: pkgconfig(libwebp) >= 0.4 %endif +BuildRequires: pkgconfig(netcdf) BuildRequires: pkgconfig(ogg) BuildRequires: pkgconfig(opus) BuildRequires: pkgconfig(schroedinger-1.0) @@ -114,16 +119,12 @@ %if %{with xvid} BuildRequires: libxvidcore-devel %endif -%if %{with dcadec} -BuildRequires: pkgconfig(dcadec) -%endif +%if %{with opencore} BuildRequires: pkgconfig(opencore-amrnb) +%endif %if %{with twolame} BuildRequires: pkgconfig(twolame) %endif -%if %{with vo_aacenc} -BuildRequires: pkgconfig(vo-aacenc) -%endif %if %{with x264} BuildRequires: pkgconfig(x264) %endif @@ -132,15 +133,19 @@ %endif %endif BuildRoot: %{_tmppath}/%{name}-%{version}-build +Provides: ffmpeg-tools = %{version} +Obsoletes: ffmpeg-tools < %{version} %description -FFmpeg is the leading multimedia framework, able to decode, encode, -transcode, mux, demux, stream, filter and play pretty much anything -that humans and machines have created. It supports the most obscure -ancient formats up to the cutting edge. No matter if they were -designed by some standards committee, the community or a corporation. +FFmpeg is a multimedia framework, able to decode, encode, +transcode, mux, demux, stream, filter and play several formats +that humans and machines have created. +%if !0%{?BUILD_ORIG} -%package -n libavcodec56 +This build of ffmpeg is limited in the number of codecs supported. +%endif + +%package -n libavcodec57 Summary: FFmpeg codec library Group: System/Libraries # For mozillas @@ -149,19 +154,19 @@ Provides: libavcodec-full = %version-%release %endif -%description -n libavcodec56 +%description -n libavcodec57 The libavcodec library provides a generic encoding/decoding framework and contains multiple decoders and encoders for audio, video and subtitle streams, and several bitstream filters. +%if !0%{?BUILD_ORIG} -The shared architecture provides various services ranging from bit -stream I/O to DSP optimizations, and makes it suitable for -implementing robust and fast codecs as well as for experimentation. +This build of ffmpeg is limited in the number of codecs supported. +%endif %package -n libavcodec-devel Summary: Development files for FFmpeg's codec library Group: Development/Libraries/C and C++ -Requires: libavcodec56 = %version +Requires: libavcodec57 = %version %description -n libavcodec-devel The libavcodec library provides a generic encoding/decoding framework @@ -170,11 +175,11 @@ This subpackage contains the headers for FFmpeg libavcodec. -%package -n libavdevice56 +%package -n libavdevice57 Summary: FFmpeg device library Group: System/Libraries -%description -n libavdevice56 +%description -n libavdevice57 The libavdevice library provides a generic framework for grabbing from and rendering to many common multimedia input/output devices, and supports several input and output devices, including Video4Linux2, VfW, @@ -183,7 +188,9 @@ %package -n libavdevice-devel Summary: Development files for FFmpeg's device library Group: Development/Libraries/C and C++ -Requires: libavdevice56 = %version +Requires: libavdevice57 = %version +Provides: ffmpeg-devel = %version +Obsoletes: ffmpeg-devel < %version %description -n libavdevice-devel The libavdevice library provides a generic framework for grabbing from @@ -193,18 +200,18 @@ This subpackage contains the headers for FFmpeg libavcodec. -%package -n libavfilter5 +%package -n libavfilter6 Summary: FFmpeg audio and video filtering library Group: System/Libraries -%description -n libavfilter5 +%description -n libavfilter6 The libavfilter library provides a generic audio/video filtering framework containing several filters, sources and sinks. %package -n libavfilter-devel Summary: Development files for FFmpeg's audio/video filter library Group: Development/Libraries/C and C++ -Requires: libavfilter5 = %version +Requires: libavfilter6 = %version %description -n libavfilter-devel The libavfilter library provides a generic audio/video filtering @@ -212,20 +219,24 @@ This subpackage contains the headers for FFmpeg libavcodec. -%package -n libavformat56 +%package -n libavformat57 Summary: FFmpeg's stream format library Group: System/Libraries -%description -n libavformat56 +%description -n libavformat57 The libavformat library provides a generic framework for multiplexing and demultiplexing (muxing and demuxing) audio, video and subtitle streams. It encompasses multiple muxers and demuxers for multimedia container formats. +%if !0%{?BUILD_ORIG} + +This build of ffmpeg is limited in the number of codecs supported. +%endif %package -n libavformat-devel Summary: Development files for FFmpeg's stream format library Group: Development/Libraries/C and C++ -Requires: libavformat56 = %version +Requires: libavformat57 = %version %description -n libavformat-devel The libavformat library provides a generic framework for multiplexing @@ -235,11 +246,11 @@ This subpackage contains the headers for FFmpeg libavcodec. -%package -n libavresample2 +%package -n libavresample3 Summary: FFmpeg alternate audio resampling library Group: System/Libraries -%description -n libavresample2 +%description -n libavresample3 An audio resampling library that is being provided for drop-in compatibility with libav. @@ -248,7 +259,7 @@ %package -n libavresample-devel Summary: Development files for libavresample as present in FFmpeg Group: Development/Libraries/C and C++ -Requires: libavresample2 = %version +Requires: libavresample3 = %version %description -n libavresample-devel An audio resampling library that is being provided for drop-in @@ -258,11 +269,11 @@ This subpackage contains the headers for FFmpeg's copy of libavresample. -%package -n libavutil54 +%package -n libavutil55 Summary: FFmpeg's utility library Group: System/Libraries -%description -n libavutil54 +%description -n libavutil55 The libavutil library is a utility library to aid portable multimedia programming. It contains safe portable string functions, random number generators, data structures, additional mathematics functions, @@ -272,7 +283,7 @@ %package -n libavutil-devel Summary: Development files for FFmpeg's utility library Group: Development/Libraries/C and C++ -Requires: libavutil54 = %version +Requires: libavutil55 = %version %description -n libavutil-devel The libavutil library is a utility library to aid portable multimedia @@ -283,11 +294,11 @@ This subpackage contains the headers for FFmpeg libavcodec. -%package -n libpostproc53 +%package -n libpostproc54 Summary: FFmpeg post-processing library Group: System/Libraries -%description -n libpostproc53 +%description -n libpostproc54 A library with video postprocessing filters, such as deblocking and deringing filters, noise reduction, automatic contrast and brightness correction, linear/cubic interpolating deinterlacing. @@ -295,7 +306,7 @@ %package -n libpostproc-devel Summary: Development files for the FFmpeg post-processing library Group: Development/Libraries/C and C++ -Requires: libpostproc53 = %version +Requires: libpostproc54 = %version %description -n libpostproc-devel A library with video postprocessing filters, such as deblocking and @@ -304,18 +315,18 @@ This subpackage contains the headers for FFmpeg libavcodec. -%package -n libswresample1 +%package -n libswresample2 Summary: FFmpeg software resampling library Group: System/Libraries -%description -n libswresample1 +%description -n libswresample2 The libswresample library performs audio conversion between different sample rates, channel layout and channel formats. %package -n libswresample-devel Summary: Development files for the FFmpeg software resampling library Group: Development/Libraries/C and C++ -Requires: libswresample1 = %version +Requires: libswresample2 = %version %description -n libswresample-devel The libswresample library performs audio conversion between different @@ -323,18 +334,18 @@ This subpackage contains the headers for FFmpeg libswresample. -%package -n libswscale3 +%package -n libswscale4 Summary: FFmpeg image scaling and colorspace/pixel conversion library Group: System/Libraries -%description -n libswscale3 +%description -n libswscale4 The libswscale library performs image scaling and colorspace and pixel format conversion operations. %package -n libswscale-devel Summary: Development files for FFmpeg's image scaling and colorspace library Group: Development/Libraries/C and C++ -Requires: libswscale3 = %version +Requires: libswscale4 = %version %description -n libswscale-devel The libswscale library performs image scaling and colorspace and @@ -342,49 +353,14 @@ This subpackage contains the headers for FFmpeg libswscale. -%package devel -Summary: Development files for FFmpeg -Group: Development/Libraries/C and C++ -Requires: libavcodec-devel = %version -Requires: libavdevice-devel = %version -Requires: libavfilter-devel = %version -Requires: libavformat-devel = %version -Requires: libavutil-devel = %version -Requires: libpostproc-devel = %version -Requires: libswresample-devel = %version -Requires: libswscale-devel = %version - -%description devel -FFmpeg consists of a number of C libraries that work with various -multimedia formats. - -This metapackage will pull them all in. %prep %setup -q -%patch1 -p1 -%patch2 -p1 +%patch -P 1 -P 2 -P 3 -P 4 -P 5 -p1 %build perl -i -pe 's{__TIME__|__DATE__}{"$&"}g' *.c -%if !0%{?BUILD_ORIG} -#image -b="$b,012v,ansi,apng,bmp,flac,exr,ffv1,ffvhuff,gif,huffyuv" -b="$b,jpegls,libopenjpeg,libtheora,libvpx,pam,pbm,pcx,pgm,png,pgmyuv,ppm" -b="$b,sgi,sunrast,targa,tiff,v210,v308,v408,v410,webp,xbm,xwd,y41p,yuv4" -d="ljpeg,v210x,vorbis,vp3,vp5,vp6,vp6a,vp6f,vp8,vp9" -#audio -b="$b,celt,flac,ilbc,opus,pcm_alaw,pcm_bluray,pcm_dvd,pcm_f32be,pcm_f32le" -b="$b,pcm_f64be,pcm_f64le,pcm_mulaw,pcm_s16be,pcm_s16be_planer,pcm_s16le" -b="$b,pcm_s16le_planar,pcm_s24be,pcm_s24le,pcm_s24le_planar,pcm_s32be" -b="$b,pcm_s32le,pcm_s32le_planar,pcm_s8,pcm_s8_planar,pcm_u16be,pcm_u16le" -b="$b,pcm_u24be,pcm_u24le,pcm_u32be,pcm_u32le,pcm_u8,speex" -e="libvorbis" -#other -d="$d,otf,ttf,ass,srt,ssa,text" -%endif - CFLAGS="%optflags" \ ./configure \ --prefix="%_prefix" --libdir="%_libdir" --shlibdir="%_libdir" \ @@ -424,6 +400,7 @@ %if %{with webp} --enable-libwebp \ %endif + --enable-netcdf \ --enable-pic \ --enable-pthreads \ %if %{with libva} @@ -433,22 +410,17 @@ --enable-vdpau \ %endif %if 0%{?BUILD_ORIG} -%if %{with dcadec} - --disable-decoder="dca" \ - --enable-libdcadec \ -%endif %if %{with lame} --enable-libmp3lame \ %endif +%if %{with opencore} --enable-libopencore-amrnb \ --enable-libopencore-amrwb \ --enable-version3 \ +%endif %if %{with twolame} --enable-libtwolame \ %endif -%if %{with vo_aacenc} - --enable-libvo-aacenc \ -%endif %if %{with x264} --enable-libx264 \ %endif @@ -463,12 +435,14 @@ --disable-decoders \ --disable-muxers \ --disable-demuxers \ - --enable-encoder="$b,$e" \ - --enable-decoder="$b,$d" \ - --enable-muxer="flac,gif,image2,image2pipe,matroska,matroska_audio,null,webm" \ - --enable-demuxer="flac,gif,image2,image2pipe,matroska" \ + --disable-decoder=mpeg1video,mpeg2video,mpeg4,h264,vc1 \ + --enable-encoder="$(perl -pe 's{^(\w*).*}{$1,}gs' <%_sourcedir/enable_encoders)" \ + --enable-decoder="$(perl -pe 's{^(\w*).*}{$1,}gs' <%_sourcedir/enable_decoders)" \ + --enable-muxer="$(perl -pe 's{^(\w*).*}{$1,}gs' <%_sourcedir/enable_muxers)" \ + --enable-demuxer="$(perl -pe 's{^(\w*).*}{$1,}gs' <%_sourcedir/enable_demuxers)" \ %endif --enable-x11grab +cat config.h make %{?_smp_mflags} %global extratools aviocat cws2fws ffescape ffeval ffhash fourcc2pixfmt graph2dot ismindex pktdumper probetest qt-faststart seek_print trasher @@ -485,24 +459,24 @@ cp -a "tools/$i" "$b/%_bindir/" done -%post -n libavcodec56 -p /sbin/ldconfig -%postun -n libavcodec56 -p /sbin/ldconfig -%post -n libavdevice56 -p /sbin/ldconfig -%postun -n libavdevice56 -p /sbin/ldconfig -%post -n libavfilter5 -p /sbin/ldconfig -%postun -n libavfilter5 -p /sbin/ldconfig -%post -n libavformat56 -p /sbin/ldconfig -%postun -n libavformat56 -p /sbin/ldconfig -%post -n libavresample2 -p /sbin/ldconfig -%postun -n libavresample2 -p /sbin/ldconfig -%post -n libavutil54 -p /sbin/ldconfig -%postun -n libavutil54 -p /sbin/ldconfig -%post -n libpostproc53 -p /sbin/ldconfig -%postun -n libpostproc53 -p /sbin/ldconfig -%post -n libswresample1 -p /sbin/ldconfig -%postun -n libswresample1 -p /sbin/ldconfig -%post -n libswscale3 -p /sbin/ldconfig -%postun -n libswscale3 -p /sbin/ldconfig +%post -n libavcodec57 -p /sbin/ldconfig +%postun -n libavcodec57 -p /sbin/ldconfig +%post -n libavdevice57 -p /sbin/ldconfig +%postun -n libavdevice57 -p /sbin/ldconfig +%post -n libavfilter6 -p /sbin/ldconfig +%postun -n libavfilter6 -p /sbin/ldconfig +%post -n libavformat57 -p /sbin/ldconfig +%postun -n libavformat57 -p /sbin/ldconfig +%post -n libavresample3 -p /sbin/ldconfig +%postun -n libavresample3 -p /sbin/ldconfig +%post -n libavutil55 -p /sbin/ldconfig +%postun -n libavutil55 -p /sbin/ldconfig +%post -n libpostproc54 -p /sbin/ldconfig +%postun -n libpostproc54 -p /sbin/ldconfig +%post -n libswresample2 -p /sbin/ldconfig +%postun -n libswresample2 -p /sbin/ldconfig +%post -n libswscale4 -p /sbin/ldconfig +%postun -n libswscale4 -p /sbin/ldconfig %files %defattr(-,root,root) @@ -511,39 +485,39 @@ %_mandir/man1/ff*.1* %_datadir/ffmpeg/ -%files -n libavcodec56 +%files -n libavcodec57 %defattr(-,root,root) %_libdir/libavcodec.so.* -%files -n libavdevice56 +%files -n libavdevice57 %defattr(-,root,root) %_libdir/libavdevice.so.* -%files -n libavfilter5 +%files -n libavfilter6 %defattr(-,root,root) %_libdir/libavfilter.so.* -%files -n libavformat56 +%files -n libavformat57 %defattr(-,root,root) %_libdir/libavformat.so.* -%files -n libavresample2 +%files -n libavresample3 %defattr(-,root,root) %_libdir/libavresample.so.* -%files -n libavutil54 +%files -n libavutil55 %defattr(-,root,root) %_libdir/libavutil.so.* -%files -n libpostproc53 +%files -n libpostproc54 %defattr(-,root,root) %_libdir/libpostproc.so.* -%files -n libswresample1 +%files -n libswresample2 %defattr(-,root,root) %_libdir/libswresample.so.* -%files -n libswscale3 +%files -n libswscale4 %defattr(-,root,root) %_libdir/libswscale.so.* @@ -617,8 +591,4 @@ %_libdir/pkgconfig/libswscale.pc %_mandir/man3/libswscale.3* -%files devel -%defattr(-,root,root) -%dir %_includedir/ffmpeg/ - %changelog ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.loJafG/_old 2016-08-26 23:15:51.000000000 +0200 +++ /var/tmp/diff_new_pack.loJafG/_new 2016-08-26 23:15:51.000000000 +0200 @@ -1,9 +1,9 @@ -libavcodec56 -libavdevice56 -libavfilter5 -libavformat56 -libavresample2 -libavutil54 -libpostproc53 -libswresample1 -libswscale3 +libavcodec57 +libavdevice57 +libavfilter6 +libavformat57 +libavresample3 +libavutil55 +libpostproc54 +libswresample2 +libswscale4 ++++++ enable_decoders ++++++ ansi # trivial apng ass # trivial ayuv # trivial bmp # trivial dirac # dirac exr # openEXR ffv1 # ffmpeg ffvhuff # ffmpeg ffwavesynth # pseudo flac # libFLAC gif # libpng gsm # libgsm huffyuv # trivial+zlib libcelt libgsm libopenjpeg libopus libschroedinger libspeex libvorbis libvpx_vp8 libvpx_vp9 mjpeg # mjpegtools #mpeg1video # libav #mpeg2video # libav #mpeg4 # libav opus # libopus pam # trivial pbm # trivial pcm_alaw # trivial pcm_bluray pcm_dvd pcm_f32be # trivial pcm_f32le # trivial pcm_f64be # trivial pcm_f64le # trivial pcm_mulaw # trivial pcm_s16be # trivial pcm_s16be_planar # trivial pcm_s16le # trivial pcm_s16le_planar # trivial pcm_s24be # trivial pcm_s24le # trivial pcm_s24le_planar # trivial pcm_s32be # trivial pcm_s32le # trivial pcm_s32le_planar # trivial pcm_s8 # trivial pcm_s8_planar # trivial pcm_u16be # trivial pcm_u16le # trivial pcm_u24be # trivial pcm_u24le # trivial pcm_u32be # trivial pcm_u32le # trivial pcm_u8 # trivial pcx pgm # trivial pgmyuv # trivial pgssub # mkvtoolnix png # libpng ppm # trivial rawvideo # trivial sgi # trivial srt # trivial ssa # trivial sunrast # trivial targa # trivial text # trivial theora # libtheora tiff # libtiff v210 # trivial v210x # trivial v308 # trivial v408 # trivial v410 # trivial vorbis # libvorbis vp3 # libav vp5 # libav vp6 # libav vp6a # libav vp6f # libav vp8 # libvpx vp9 # libvpx webp # libwebp xbm # trivial xwd # xwd y41p # trivial yuv4 # trivial zlib # pseudo ++++++ enable_demuxers ++++++ aac # mkvtoolnix ac3 # mkvtoolnix adts # mkvtoolnix aiff # trivial apng # libpng asf ass # trivial, mkvtoolnix au # trivial avi # mkvtoolnix concat # ffm pseudo data # ffm pseudo dirac # dirac, mkvtoolnix dts # mkvtoolnix dv # libav flac # libFLAC, mkvtoolnix flv # mkvtoolnix ffm # pseudo ffmetadata # pseudo gif # libgif gsm # libgsm h264 # mkvtoolnix hevc # mkvtoolnix ico # icoutils iff # trivial ilbc # ilbc image2 # libav image2pipe # libav image_bmp_pipe # trivial image_exr_pipe # OpenEXR image_j2k_pipe # openjpeg2 image_jpeg_pipe # libjpeg image_png_pipe # libpng image_sgi_pipe # trivial image_sunrast_pipe # trivial image_tiff_pipe # libtiff image_webp_pipe # libwebp ivf # mkvtoolnix matroska # libmatroska mjpeg # mjpegtools mov # mkvtoolnix mp3 # mkvtoolnix mp4 # mkvtoolnix mpegps # mkvtoolnix mpegts # mkvtoolnix mpegtsraw # mkvtoolnix mpegvideo # mkvtoolnix ogg # libogg, mkvtoolnix pcm_alaw # trivial pcm_f32be # trivial pcm_f32le # trivial pcm_f64be # trivial pcm_f64le # trivial pcm_mulaw # trivial pcm_s16be # trivial pcm_s16le # trivial pcm_s24be # trivial pcm_s24le # trivial pcm_s32be # trivial pcm_s32le # trivial pcm_s8 # trivial pcm_u16be # trivial pcm_u16le # trivial pcm_u24be # trivial pcm_u24le # trivial pcm_u32be # trivial pcm_u32le # trivial pcm_u8 # trivial rawvideo # trivial rm # mkvtoolnix sln # trivial sox # sox srt # trivial, mkvtoolnix truehd # mkvtoolnix tta # mkvtoolnix tty # pseudo v210 # trivial v210x # trivial vc1 # mkvtoolnix vobsub # mkvtoolnix wav # trivial, mkvtoolnix webvtt # webm ++++++ enable_encoders ++++++ apng # libpng ass # trivial ayuv # trival bmp # trivial ffv1 ffvhuff # trivial+zlib flac # libFLAC gif # libpng huffyuv # trivial+zlib jpegls libgsm libopenjpeg libopus libschroedinger libspeex libtheora libvorbis libvpx_vp8 libvpx_vp9 libwebp libwebp_anim mjpeg pam pbm pcm_alaw pcm_f32be pcm_f32le pcm_f64be pcm_f64le pcm_mulaw pcm_s16be pcm_s16be_planar pcm_s16le pcm_s16le_planar pcm_s24be pcm_s24le pcm_s24le_planar pcm_s32be pcm_s32le pcm_s32le_planar pcm_s8 pcm_s8_planar pcm_u16be pcm_u16le pcm_u24be pcm_u24le pcm_u32be pcm_u32le pcm_u8 pcx pgm pgmyuv png ppm sgi srt ssa sunrast targa text tiff v210 v308 v408 v410 vorbis xbm xwd y41p yuv4 zlib ++++++ enable_muxers ++++++ aac # mkvtoolnix ac3 # mkvtoolnix adts # mkvtoolnix aiff # trivial apng # libpng asf ass # trivial, mkvtoolnix au # trivial avi crc data dirac # dirac, mkvtoolnix ffm # pseudo ffmetadata # pseudo flac # libFLAC, mkvtoolnix framecrc # pseudo framemd5 # pseudo gif # libgif h264 # mkvtoolnix hevc # mkvtoolnix ico # icoutils ilbc # ilbc image2 image2pipe matroska # libmatroska matroska_audio # libmatroska md5 # pseudo mjpeg # mjpegtools mov # mkvtoolnix mpegts # mkvtoolnix mp3 # mkvtoolnix mp4 # mkvtoolnix mkvtimestamp_v2 # libmatroska null # pseudo ogg # libogg, mkvtoolnix opus # libopus, mkvtoolnix pcm_alaw # trivial pcm_f32be # trivial pcm_f32le # trivial pcm_f64be # trivial pcm_f64le # trivial pcm_mulaw # trivial pcm_s16be # trivial pcm_s16le # trivial pcm_s24be # trivial pcm_s24le # trivial pcm_s32be # trivial pcm_s32le # trivial pcm_s8 # trivial pcm_u16be # trivial pcm_u16le # trivial pcm_u24be # trivial pcm_u24le # trivial pcm_u32be # trivial pcm_u32le # trivial pcm_u8 # trivial rawvideo # trivial singlejpeg # libjpeg sox # sox srt # trivial, mkvtoolnix tee # pseudo truehd # mkvtoolnix uncodedframecrc # pseudo vc1 # mkvtoolnix wav # trivial webm # webm webm_chunk # webm webp # libwebp webvtt # webm ++++++ ffmpeg-2.4.5-arm6l.patch ++++++ --- /var/tmp/diff_new_pack.loJafG/_old 2016-08-26 23:15:51.000000000 +0200 +++ /var/tmp/diff_new_pack.loJafG/_new 2016-08-26 23:15:51.000000000 +0200 @@ -2,10 +2,10 @@ libavutil/arm/timer.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: ffmpeg-2.8.3/libavutil/arm/timer.h +Index: ffmpeg-3.0.1/libavutil/arm/timer.h =================================================================== ---- ffmpeg-2.8.3.orig/libavutil/arm/timer.h -+++ ffmpeg-2.8.3/libavutil/arm/timer.h +--- ffmpeg-3.0.1.orig/libavutil/arm/timer.h ++++ ffmpeg-3.0.1/libavutil/arm/timer.h @@ -24,7 +24,7 @@ #include <stdint.h> #include "config.h" ++++++ ffmpeg-codec-choice.diff ++++++ From: Jan Engelhardt <jeng...@inai.de> Edit the default codec selection such that ffmpeg -i youtube.blah.webm foobar.mkv without any further arguments can produce a result even on a reduced codec selection list. --- libavformat/matroskaenc.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) Index: ffmpeg-3.0.1/libavformat/matroskaenc.c =================================================================== --- ffmpeg-3.0.1.orig/libavformat/matroskaenc.c +++ ffmpeg-3.0.1/libavformat/matroskaenc.c @@ -2177,16 +2177,24 @@ static const AVClass matroska_class = { .version = LIBAVUTIL_VERSION_INT, }; +#define PREFAUDIO \ + CONFIG_LIBOPUS_ENCODER ? AV_CODEC_ID_OPUS : \ + CONFIG_AAC_ENCODER ? AV_CODEC_ID_AAC : \ + CONFIG_VORBIS_ENCODER ? AV_CODEC_ID_VORBIS : \ + AV_CODEC_ID_AC3 AVOutputFormat ff_matroska_muxer = { .name = "matroska", .long_name = NULL_IF_CONFIG_SMALL("Matroska"), .mime_type = "video/x-matroska", .extensions = "mkv", .priv_data_size = sizeof(MatroskaMuxContext), - .audio_codec = CONFIG_LIBVORBIS_ENCODER ? - AV_CODEC_ID_VORBIS : AV_CODEC_ID_AC3, - .video_codec = CONFIG_LIBX264_ENCODER ? - AV_CODEC_ID_H264 : AV_CODEC_ID_MPEG4, + .audio_codec = PREFAUDIO, + .video_codec = + CONFIG_LIBVPX_VP9_ENCODER ? AV_CODEC_ID_VP9 : \ + CONFIG_LIBX264_ENCODER ? AV_CODEC_ID_H264 : \ + CONFIG_LIBVPX_VP8_ENCODER ? AV_CODEC_ID_VP8 : \ + CONFIG_MPEG4_ENCODER ? AV_CODEC_ID_MPEG4 : \ + AV_CODEC_ID_THEORA, .init = mkv_init, .write_header = mkv_write_header, .write_packet = mkv_write_flush_packet, @@ -2245,8 +2253,7 @@ AVOutputFormat ff_matroska_audio_muxer = .mime_type = "audio/x-matroska", .extensions = "mka", .priv_data_size = sizeof(MatroskaMuxContext), - .audio_codec = CONFIG_LIBVORBIS_ENCODER ? - AV_CODEC_ID_VORBIS : AV_CODEC_ID_AC3, + .audio_codec = PREFAUDIO, .video_codec = AV_CODEC_ID_NONE, .init = mkv_init, .write_header = mkv_write_header, ++++++ ffmpeg-libcdio_cdda-pkgconfig.patch ++++++ --- /var/tmp/diff_new_pack.loJafG/_old 2016-08-26 23:15:51.000000000 +0200 +++ /var/tmp/diff_new_pack.loJafG/_new 2016-08-26 23:15:51.000000000 +0200 @@ -2,11 +2,11 @@ configure | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) -Index: ffmpeg-2.8.3/configure +Index: ffmpeg-3.0.1/configure =================================================================== ---- ffmpeg-2.8.3.orig/configure -+++ ffmpeg-2.8.3/configure -@@ -5453,8 +5453,9 @@ enabled jack_indev && check_lib2 jack/ja +--- ffmpeg-3.0.1.orig/configure ++++ ffmpeg-3.0.1/configure +@@ -5714,8 +5714,9 @@ enabled jack_indev && check_lib2 jack/ja enabled_any sndio_indev sndio_outdev && check_lib2 sndio.h sio_open -lsndio if enabled libcdio; then ++++++ ffmpeg-new-coder-errors.diff ++++++ From: Jan Engelhardt <jeng...@inai.de> Date: 2016-04-10 23:23:53.138440254 +0200 Improve the error messages a bit to say what's really going on (in light of openSUSE's reduced build). --- ffmpeg.c | 4 ++-- ffmpeg_filter.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) Index: ffmpeg-3.0.1/ffmpeg.c =================================================================== --- ffmpeg-3.0.1.orig/ffmpeg.c +++ ffmpeg-3.0.1/ffmpeg.c @@ -2525,7 +2525,7 @@ static int init_input_stream(int ist_ind if (ist->decoding_needed) { AVCodec *codec = ist->dec; if (!codec) { - snprintf(error, error_len, "Decoder (codec %s) not found for input stream #%d:%d", + snprintf(error, error_len, "This build of ffmpeg does not include a \"%s\" decoder needed for input stream #%d:%d.", avcodec_get_name(ist->dec_ctx->codec_id), ist->file_index, ist->st->index); return AVERROR(EINVAL); } @@ -3021,7 +3021,7 @@ static int transcode_init(void) ost->enc = avcodec_find_encoder(enc_ctx->codec_id); if (!ost->enc) { /* should only happen when a default codec is not present. */ - snprintf(error, sizeof(error), "Encoder (codec %s) not found for output stream #%d:%d", + snprintf(error, sizeof(error), "This build of ffmpeg does not include a \"%s\" encoder needed for output stream #%d:%d.", avcodec_get_name(ost->st->codec->codec_id), ost->file_index, ost->index); ret = AVERROR(EINVAL); goto dump_format; Index: ffmpeg-3.0.1/ffmpeg_filter.c =================================================================== --- ffmpeg-3.0.1.orig/ffmpeg_filter.c +++ ffmpeg-3.0.1/ffmpeg_filter.c @@ -948,7 +948,7 @@ static int configure_input_filter(Filter if (!ifilter->ist->dec) { av_log(NULL, AV_LOG_ERROR, - "No decoder for stream #%d:%d, filtering impossible\n", + "This build of ffmpeg does not have a suitable decoder for stream #%d:%d enabled, filtering impossible\n", ifilter->ist->file_index, ifilter->ist->st->index); return AVERROR_DECODER_NOT_FOUND; } @@ -1057,7 +1057,7 @@ int configure_filtergraph(FilterGraph *f if (!ost->enc) { /* identical to the same check in ffmpeg.c, needed because complex filter graphs are initialized earlier */ - av_log(NULL, AV_LOG_ERROR, "Encoder (codec %s) not found for output stream #%d:%d\n", + av_log(NULL, AV_LOG_ERROR, "This build of ffmpeg_filter does not include a \"%s\" encoder needed for output stream #%d:%d.\n", avcodec_get_name(ost->st->codec->codec_id), ost->file_index, ost->index); return AVERROR(EINVAL); } ++++++ ffmpeg-pkgconfig-version.patch ++++++ --- configure | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) Index: ffmpeg-3.0.1/configure =================================================================== --- ffmpeg-3.0.1.orig/configure +++ ffmpeg-3.0.1/configure @@ -6488,7 +6488,8 @@ fi # build pkg-config files lib_version(){ - eval printf "\"lib${1}${build_suffix} >= \$LIB$(toupper ${1})_VERSION, \"" + # Require the exact version of other libs, not any future version + eval printf "\"lib${1}${build_suffix} = \$LIB$(toupper ${1})_VERSION, \"" } pkgconfig_generate(){
