Sun Mar 8 08:10:13 2015 UTC ()
Changes 2.6:
- nvenc encoder
- 10bit spp filter
- colorlevels filter
- RIFX format for *.wav files
- RTP/mpegts muxer
- non continuous cache protocol support
- tblend filter
- cropdetect support for non 8bpp, absolute (if limit >= 1) and relative (if limit < 1.0) threshold
- Camellia symmetric block cipher
- OpenH264 encoder wrapper
- VOC seeking support
- Closed caption Decoder
- fspp, uspp, pp7 MPlayer postprocessing filters ported to native filters
- showpalette filter
- Twofish symmetric block cipher
- Support DNx100 (960x720@8)
- eq2 filter ported from libmpcodecs as eq filter
- removed libmpcodecs
- Changed default DNxHD colour range in QuickTime .mov derivatives to mpeg range
- ported softpulldown filter from libmpcodecs as repeatfields filter
- dcshift filter
- RTP depacketizer for loss tolerant payload format for MP3 audio (RFC 5219)
- RTP depacketizer for AC3 payload format (RFC 4184)
- palettegen and paletteuse filters
- VP9 RTP payload format (draft 0) experimental depacketizer
- RTP depacketizer for DV (RFC 6469)
- DXVA2-accelerated HEVC decoding
- AAC ELD 480 decoding
- Intel QSV-accelerated H.264 decoding
- DSS SP decoder and DSS demuxer
- Fix stsd atom corruption in DNxHD QuickTimes
- Canopus HQX decoder
- RTP depacketization of T.140 text (RFC 4103)
- VP9 RTP payload format (draft 0) experimental depacketizer
- Port MIPS optimizations to 64-bit


(adam)
diff -r1.29 -r1.30 pkgsrc/multimedia/ffmpeg2/Makefile.common
diff -r1.7 -r1.8 pkgsrc/multimedia/ffmpeg2/PLIST
diff -r1.28 -r1.29 pkgsrc/multimedia/ffmpeg2/distinfo
diff -r0 -r1.1 pkgsrc/multimedia/ffmpeg2/patches/patch-libavutil_opencl.c

cvs diff -r1.29 -r1.30 pkgsrc/multimedia/ffmpeg2/Makefile.common (expand / switch to unified diff)

--- pkgsrc/multimedia/ffmpeg2/Makefile.common 2015/02/14 15:41:42 1.29
+++ pkgsrc/multimedia/ffmpeg2/Makefile.common 2015/03/08 08:10:13 1.30
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile.common,v 1.29 2015/02/14 15:41:42 adam Exp $ 1# $NetBSD: Makefile.common,v 1.30 2015/03/08 08:10:13 adam Exp $
2# used by multimedia/ffmpeg2/Makefile 2# used by multimedia/ffmpeg2/Makefile
3# used by multimedia/ffplay2/Makefile 3# used by multimedia/ffplay2/Makefile
4 4
5DISTNAME= ffmpeg-2.5.4 5DISTNAME= ffmpeg-2.6
6CATEGORIES= multimedia 6CATEGORIES= multimedia
7MASTER_SITES= http://www.ffmpeg.org/releases/ 7MASTER_SITES= http://www.ffmpeg.org/releases/
8EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
9 9
10LICENSE= gnu-lgpl-v2.1 AND gnu-gpl-v2 10LICENSE= gnu-lgpl-v2.1 AND gnu-gpl-v2
11 11
12PREV_PKGPATH= multimedia/ffmpeg-devel 12PREV_PKGPATH= multimedia/ffmpeg-devel
13PATCHDIR= ${.CURDIR}/../../multimedia/ffmpeg2/patches 13PATCHDIR= ${.CURDIR}/../../multimedia/ffmpeg2/patches
14 14
15USE_LANGUAGES= c99 15USE_LANGUAGES= c99
16USE_LIBTOOL= yes 16USE_LIBTOOL= yes
17USE_TOOLS+= gmake texi2html pod2man 17USE_TOOLS+= gmake texi2html pod2man
18HAS_CONFIGURE= yes 18HAS_CONFIGURE= yes

cvs diff -r1.7 -r1.8 pkgsrc/multimedia/ffmpeg2/PLIST (expand / switch to unified diff)

--- pkgsrc/multimedia/ffmpeg2/PLIST 2014/12/06 09:18:41 1.7
+++ pkgsrc/multimedia/ffmpeg2/PLIST 2015/03/08 08:10:13 1.8
@@ -1,22 +1,23 @@ @@ -1,22 +1,23 @@
1@comment $NetBSD: PLIST,v 1.7 2014/12/06 09:18:41 adam Exp $ 1@comment $NetBSD: PLIST,v 1.8 2015/03/08 08:10:13 adam Exp $
2bin/ffmpeg2 2bin/ffmpeg2
3bin/ffprobe2 3bin/ffprobe2
4bin/ffserver2 4bin/ffserver2
5include/ffmpeg2/libavcodec/avcodec.h 5include/ffmpeg2/libavcodec/avcodec.h
6include/ffmpeg2/libavcodec/avfft.h 6include/ffmpeg2/libavcodec/avfft.h
7include/ffmpeg2/libavcodec/dv_profile.h 7include/ffmpeg2/libavcodec/dv_profile.h
8include/ffmpeg2/libavcodec/dxva2.h 8include/ffmpeg2/libavcodec/dxva2.h
9include/ffmpeg2/libavcodec/old_codec_ids.h 9include/ffmpeg2/libavcodec/old_codec_ids.h
 10include/ffmpeg2/libavcodec/qsv.h
10include/ffmpeg2/libavcodec/vaapi.h 11include/ffmpeg2/libavcodec/vaapi.h
11include/ffmpeg2/libavcodec/vda.h 12include/ffmpeg2/libavcodec/vda.h
12include/ffmpeg2/libavcodec/vdpau.h 13include/ffmpeg2/libavcodec/vdpau.h
13include/ffmpeg2/libavcodec/version.h 14include/ffmpeg2/libavcodec/version.h
14include/ffmpeg2/libavcodec/vorbis_parser.h 15include/ffmpeg2/libavcodec/vorbis_parser.h
15include/ffmpeg2/libavcodec/xvmc.h 16include/ffmpeg2/libavcodec/xvmc.h
16include/ffmpeg2/libavdevice/avdevice.h 17include/ffmpeg2/libavdevice/avdevice.h
17include/ffmpeg2/libavdevice/version.h 18include/ffmpeg2/libavdevice/version.h
18include/ffmpeg2/libavfilter/asrc_abuffer.h 19include/ffmpeg2/libavfilter/asrc_abuffer.h
19include/ffmpeg2/libavfilter/avcodec.h 20include/ffmpeg2/libavfilter/avcodec.h
20include/ffmpeg2/libavfilter/avfilter.h 21include/ffmpeg2/libavfilter/avfilter.h
21include/ffmpeg2/libavfilter/avfiltergraph.h 22include/ffmpeg2/libavfilter/avfiltergraph.h
22include/ffmpeg2/libavfilter/buffersink.h 23include/ffmpeg2/libavfilter/buffersink.h
@@ -29,26 +30,27 @@ include/ffmpeg2/libavutil/adler32.h @@ -29,26 +30,27 @@ include/ffmpeg2/libavutil/adler32.h
29include/ffmpeg2/libavutil/aes.h 30include/ffmpeg2/libavutil/aes.h
30include/ffmpeg2/libavutil/attributes.h 31include/ffmpeg2/libavutil/attributes.h
31include/ffmpeg2/libavutil/audio_fifo.h 32include/ffmpeg2/libavutil/audio_fifo.h
32include/ffmpeg2/libavutil/audioconvert.h 33include/ffmpeg2/libavutil/audioconvert.h
33include/ffmpeg2/libavutil/avassert.h 34include/ffmpeg2/libavutil/avassert.h
34include/ffmpeg2/libavutil/avconfig.h 35include/ffmpeg2/libavutil/avconfig.h
35include/ffmpeg2/libavutil/avstring.h 36include/ffmpeg2/libavutil/avstring.h
36include/ffmpeg2/libavutil/avutil.h 37include/ffmpeg2/libavutil/avutil.h
37include/ffmpeg2/libavutil/base64.h 38include/ffmpeg2/libavutil/base64.h
38include/ffmpeg2/libavutil/blowfish.h 39include/ffmpeg2/libavutil/blowfish.h
39include/ffmpeg2/libavutil/bprint.h 40include/ffmpeg2/libavutil/bprint.h
40include/ffmpeg2/libavutil/bswap.h 41include/ffmpeg2/libavutil/bswap.h
41include/ffmpeg2/libavutil/buffer.h 42include/ffmpeg2/libavutil/buffer.h
 43include/ffmpeg2/libavutil/camellia.h
42include/ffmpeg2/libavutil/cast5.h 44include/ffmpeg2/libavutil/cast5.h
43include/ffmpeg2/libavutil/channel_layout.h 45include/ffmpeg2/libavutil/channel_layout.h
44include/ffmpeg2/libavutil/common.h 46include/ffmpeg2/libavutil/common.h
45include/ffmpeg2/libavutil/cpu.h 47include/ffmpeg2/libavutil/cpu.h
46include/ffmpeg2/libavutil/crc.h 48include/ffmpeg2/libavutil/crc.h
47include/ffmpeg2/libavutil/dict.h 49include/ffmpeg2/libavutil/dict.h
48include/ffmpeg2/libavutil/display.h 50include/ffmpeg2/libavutil/display.h
49include/ffmpeg2/libavutil/downmix_info.h 51include/ffmpeg2/libavutil/downmix_info.h
50include/ffmpeg2/libavutil/error.h 52include/ffmpeg2/libavutil/error.h
51include/ffmpeg2/libavutil/eval.h 53include/ffmpeg2/libavutil/eval.h
52include/ffmpeg2/libavutil/ffversion.h 54include/ffmpeg2/libavutil/ffversion.h
53include/ffmpeg2/libavutil/fifo.h 55include/ffmpeg2/libavutil/fifo.h
54include/ffmpeg2/libavutil/file.h 56include/ffmpeg2/libavutil/file.h
@@ -76,54 +78,55 @@ include/ffmpeg2/libavutil/pixelutils.h @@ -76,54 +78,55 @@ include/ffmpeg2/libavutil/pixelutils.h
76include/ffmpeg2/libavutil/pixfmt.h 78include/ffmpeg2/libavutil/pixfmt.h
77include/ffmpeg2/libavutil/random_seed.h 79include/ffmpeg2/libavutil/random_seed.h
78include/ffmpeg2/libavutil/rational.h 80include/ffmpeg2/libavutil/rational.h
79include/ffmpeg2/libavutil/replaygain.h 81include/ffmpeg2/libavutil/replaygain.h
80include/ffmpeg2/libavutil/ripemd.h 82include/ffmpeg2/libavutil/ripemd.h
81include/ffmpeg2/libavutil/samplefmt.h 83include/ffmpeg2/libavutil/samplefmt.h
82include/ffmpeg2/libavutil/sha.h 84include/ffmpeg2/libavutil/sha.h
83include/ffmpeg2/libavutil/sha512.h 85include/ffmpeg2/libavutil/sha512.h
84include/ffmpeg2/libavutil/stereo3d.h 86include/ffmpeg2/libavutil/stereo3d.h
85include/ffmpeg2/libavutil/threadmessage.h 87include/ffmpeg2/libavutil/threadmessage.h
86include/ffmpeg2/libavutil/time.h 88include/ffmpeg2/libavutil/time.h
87include/ffmpeg2/libavutil/timecode.h 89include/ffmpeg2/libavutil/timecode.h
88include/ffmpeg2/libavutil/timestamp.h 90include/ffmpeg2/libavutil/timestamp.h
 91include/ffmpeg2/libavutil/twofish.h
89include/ffmpeg2/libavutil/version.h 92include/ffmpeg2/libavutil/version.h
90include/ffmpeg2/libavutil/xtea.h 93include/ffmpeg2/libavutil/xtea.h
91include/ffmpeg2/libpostproc/postprocess.h 94include/ffmpeg2/libpostproc/postprocess.h
92include/ffmpeg2/libpostproc/version.h 95include/ffmpeg2/libpostproc/version.h
93include/ffmpeg2/libswresample/swresample.h 96include/ffmpeg2/libswresample/swresample.h
94include/ffmpeg2/libswresample/version.h 97include/ffmpeg2/libswresample/version.h
95include/ffmpeg2/libswscale/swscale.h 98include/ffmpeg2/libswscale/swscale.h
96include/ffmpeg2/libswscale/version.h 99include/ffmpeg2/libswscale/version.h
97lib/ffmpeg2/libavcodec.a 100lib/ffmpeg2/libavcodec.a
98lib/ffmpeg2/libavcodec.so 101lib/ffmpeg2/libavcodec.so
99lib/ffmpeg2/libavcodec.so.56 102lib/ffmpeg2/libavcodec.so.56
100lib/ffmpeg2/libavcodec.so.56.13.100 103lib/ffmpeg2/libavcodec.so.56.26.100
101lib/ffmpeg2/libavdevice.a 104lib/ffmpeg2/libavdevice.a
102lib/ffmpeg2/libavdevice.so 105lib/ffmpeg2/libavdevice.so
103lib/ffmpeg2/libavdevice.so.56 106lib/ffmpeg2/libavdevice.so.56
104lib/ffmpeg2/libavdevice.so.56.3.100 107lib/ffmpeg2/libavdevice.so.56.4.100
105lib/ffmpeg2/libavfilter.a 108lib/ffmpeg2/libavfilter.a
106lib/ffmpeg2/libavfilter.so 109lib/ffmpeg2/libavfilter.so
107lib/ffmpeg2/libavfilter.so.5 110lib/ffmpeg2/libavfilter.so.5
108lib/ffmpeg2/libavfilter.so.5.2.103 111lib/ffmpeg2/libavfilter.so.5.11.102
109lib/ffmpeg2/libavformat.a 112lib/ffmpeg2/libavformat.a
110lib/ffmpeg2/libavformat.so 113lib/ffmpeg2/libavformat.so
111lib/ffmpeg2/libavformat.so.56 114lib/ffmpeg2/libavformat.so.56
112lib/ffmpeg2/libavformat.so.56.15.102 115lib/ffmpeg2/libavformat.so.56.25.101
113lib/ffmpeg2/libavutil.a 116lib/ffmpeg2/libavutil.a
114lib/ffmpeg2/libavutil.so 117lib/ffmpeg2/libavutil.so
115lib/ffmpeg2/libavutil.so.54 118lib/ffmpeg2/libavutil.so.54
116lib/ffmpeg2/libavutil.so.54.15.100 119lib/ffmpeg2/libavutil.so.54.20.100
117lib/ffmpeg2/libpostproc.a 120lib/ffmpeg2/libpostproc.a
118lib/ffmpeg2/libpostproc.so 121lib/ffmpeg2/libpostproc.so
119lib/ffmpeg2/libpostproc.so.53 122lib/ffmpeg2/libpostproc.so.53
120lib/ffmpeg2/libpostproc.so.53.3.100 123lib/ffmpeg2/libpostproc.so.53.3.100
121lib/ffmpeg2/libswresample.a 124lib/ffmpeg2/libswresample.a
122lib/ffmpeg2/libswresample.so 125lib/ffmpeg2/libswresample.so
123lib/ffmpeg2/libswresample.so.1 126lib/ffmpeg2/libswresample.so.1
124lib/ffmpeg2/libswresample.so.1.1.100 127lib/ffmpeg2/libswresample.so.1.1.100
125lib/ffmpeg2/libswscale.a 128lib/ffmpeg2/libswscale.a
126lib/ffmpeg2/libswscale.so 129lib/ffmpeg2/libswscale.so
127lib/ffmpeg2/libswscale.so.3 130lib/ffmpeg2/libswscale.so.3
128lib/ffmpeg2/libswscale.so.3.1.101 131lib/ffmpeg2/libswscale.so.3.1.101
129lib/ffmpeg2/pkgconfig/libavcodec.pc 132lib/ffmpeg2/pkgconfig/libavcodec.pc
@@ -150,24 +153,25 @@ share/doc/ffmpeg2/tablegen.txt @@ -150,24 +153,25 @@ share/doc/ffmpeg2/tablegen.txt
150share/doc/ffmpeg2/writing_filters.txt 153share/doc/ffmpeg2/writing_filters.txt
151share/examples/ffmpeg2/ffserver.conf 154share/examples/ffmpeg2/ffserver.conf
152share/ffmpeg2/examples/Makefile 155share/ffmpeg2/examples/Makefile
153share/ffmpeg2/examples/README 156share/ffmpeg2/examples/README
154share/ffmpeg2/examples/avio_reading.c 157share/ffmpeg2/examples/avio_reading.c
155share/ffmpeg2/examples/decoding_encoding.c 158share/ffmpeg2/examples/decoding_encoding.c
156share/ffmpeg2/examples/demuxing_decoding.c 159share/ffmpeg2/examples/demuxing_decoding.c
157share/ffmpeg2/examples/extract_mvs.c 160share/ffmpeg2/examples/extract_mvs.c
158share/ffmpeg2/examples/filter_audio.c 161share/ffmpeg2/examples/filter_audio.c
159share/ffmpeg2/examples/filtering_audio.c 162share/ffmpeg2/examples/filtering_audio.c
160share/ffmpeg2/examples/filtering_video.c 163share/ffmpeg2/examples/filtering_video.c
161share/ffmpeg2/examples/metadata.c 164share/ffmpeg2/examples/metadata.c
162share/ffmpeg2/examples/muxing.c 165share/ffmpeg2/examples/muxing.c
 166share/ffmpeg2/examples/qsvdec.c
163share/ffmpeg2/examples/remuxing.c 167share/ffmpeg2/examples/remuxing.c
164share/ffmpeg2/examples/resampling_audio.c 168share/ffmpeg2/examples/resampling_audio.c
165share/ffmpeg2/examples/scaling_video.c 169share/ffmpeg2/examples/scaling_video.c
166share/ffmpeg2/examples/transcode_aac.c 170share/ffmpeg2/examples/transcode_aac.c
167share/ffmpeg2/examples/transcoding.c 171share/ffmpeg2/examples/transcoding.c
168share/ffmpeg2/ffprobe.xsd 172share/ffmpeg2/ffprobe.xsd
169share/ffmpeg2/libvpx-1080p.ffpreset 173share/ffmpeg2/libvpx-1080p.ffpreset
170share/ffmpeg2/libvpx-1080p50_60.ffpreset 174share/ffmpeg2/libvpx-1080p50_60.ffpreset
171share/ffmpeg2/libvpx-360p.ffpreset 175share/ffmpeg2/libvpx-360p.ffpreset
172share/ffmpeg2/libvpx-720p.ffpreset 176share/ffmpeg2/libvpx-720p.ffpreset
173share/ffmpeg2/libvpx-720p50_60.ffpreset 177share/ffmpeg2/libvpx-720p50_60.ffpreset

cvs diff -r1.28 -r1.29 pkgsrc/multimedia/ffmpeg2/distinfo (expand / switch to unified diff)

--- pkgsrc/multimedia/ffmpeg2/distinfo 2015/02/14 15:41:42 1.28
+++ pkgsrc/multimedia/ffmpeg2/distinfo 2015/03/08 08:10:13 1.29
@@ -1,11 +1,12 @@ @@ -1,11 +1,12 @@
1$NetBSD: distinfo,v 1.28 2015/02/14 15:41:42 adam Exp $ 1$NetBSD: distinfo,v 1.29 2015/03/08 08:10:13 adam Exp $
2 2
3SHA1 (ffmpeg-2.5.4.tar.bz2) = e7d0bab14e82876762531a883c6b48918631d48c 3SHA1 (ffmpeg-2.6.tar.bz2) = 3bfc61fc3906373aecaaa523a9d13cfa9ff7e7ed
4RMD160 (ffmpeg-2.5.4.tar.bz2) = 523955845e4880c13e200846daf7787055a6db9b 4RMD160 (ffmpeg-2.6.tar.bz2) = 86c4af5b3f43fde318a7a8557f6787449a4d28c5
5Size (ffmpeg-2.5.4.tar.bz2) = 7677320 bytes 5Size (ffmpeg-2.6.tar.bz2) = 7799342 bytes
6SHA1 (patch-Makefile) = ff8a7a5fdfd4987ef2835bd7360a78efd4310253 6SHA1 (patch-Makefile) = ff8a7a5fdfd4987ef2835bd7360a78efd4310253
7SHA1 (patch-configure) = 580e744f44bc6b7622a21d27fcf14f934a280179 7SHA1 (patch-configure) = 580e744f44bc6b7622a21d27fcf14f934a280179
8SHA1 (patch-libavcodec_x86_ac3dsp_init.c) = 8634661d76bc3bce43437caa4244b4f52237709f 8SHA1 (patch-libavcodec_x86_ac3dsp_init.c) = 8634661d76bc3bce43437caa4244b4f52237709f
9SHA1 (patch-libavutil_common.h) = ebbd0c169f228af37ae2dd54b27d5dba11a34c5e 9SHA1 (patch-libavutil_common.h) = ebbd0c169f228af37ae2dd54b27d5dba11a34c5e
 10SHA1 (patch-libavutil_opencl.c) = 46da890f06ab3db7fbed84aff0f6f30fa1d2adfe
10SHA1 (patch-libavutil_x86_asm.h) = 3fe732ec6da9f0920d3c6e3a5db9bed65b0a3e40 11SHA1 (patch-libavutil_x86_asm.h) = 3fe732ec6da9f0920d3c6e3a5db9bed65b0a3e40
11SHA1 (patch-libavutil_x86_cpu.c) = ece66a5b22130754c11c643dae48171d04d3246f 12SHA1 (patch-libavutil_x86_cpu.c) = ece66a5b22130754c11c643dae48171d04d3246f

File Added: pkgsrc/multimedia/ffmpeg2/patches/Attic/patch-libavutil_opencl.c
$NetBSD: patch-libavutil_opencl.c,v 1.1 2015/03/08 08:10:13 adam Exp $

Fix undeclared identifier error.

--- libavutil/opencl.c.orig	2015-03-08 07:52:00.000000000 +0000
+++ libavutil/opencl.c
@@ -611,7 +611,7 @@ void av_opencl_uninit(void)
         }
         opencl_ctx.context = NULL;
     }
-    for (i = 0; i < opencl_ctx.kernel_code_count; i++) {
+    for (int i = 0; i < opencl_ctx.kernel_code_count; i++) {
         opencl_ctx.kernel_code[i].is_compiled = 0;
     }
     free_device_list(&opencl_ctx.device_list);