Here is a newer snapshot of FFmpeg along the 1.2 branch; bringing in a bunch of bug fixes.
Index: graphics/ffmpeg/Makefile =================================================================== RCS file: /home/cvs/ports/graphics/ffmpeg/Makefile,v retrieving revision 1.99 diff -u -p -r1.99 Makefile --- graphics/ffmpeg/Makefile 14 Apr 2013 21:10:49 -0000 1.99 +++ graphics/ffmpeg/Makefile 12 Jun 2013 20:02:58 -0000 @@ -2,7 +2,7 @@ COMMENT= audio/video converter and streamer -V= 20130319 +V= 20130612 DISTNAME= ffmpeg-git-${V} PKGNAME= ffmpeg-${V} CATEGORIES= graphics multimedia Index: graphics/ffmpeg/distinfo =================================================================== RCS file: /home/cvs/ports/graphics/ffmpeg/distinfo,v retrieving revision 1.27 diff -u -p -r1.27 distinfo --- graphics/ffmpeg/distinfo 8 Apr 2013 17:06:55 -0000 1.27 +++ graphics/ffmpeg/distinfo 12 Jun 2013 20:01:36 -0000 @@ -1,2 +1,2 @@ -SHA256 (ffmpeg-git-20130319.tar.xz) = 7WnaAMIJM0w6XxAtkdtQejWGlkYyGMlDeH23IpjqTYU= -SIZE (ffmpeg-git-20130319.tar.xz) = 4912640 +SHA256 (ffmpeg-git-20130612.tar.xz) = miutwMmKL27WHh44MvpATIDG+LKSf+oCVf+50gQXkQw= +SIZE (ffmpeg-git-20130612.tar.xz) = 4912688 Index: graphics/ffmpeg/patches/patch-configure =================================================================== RCS file: /home/cvs/ports/graphics/ffmpeg/patches/patch-configure,v retrieving revision 1.36 diff -u -p -r1.36 patch-configure --- graphics/ffmpeg/patches/patch-configure 8 Apr 2013 17:06:56 -0000 1.36 +++ graphics/ffmpeg/patches/patch-configure 12 Jun 2013 20:02:43 -0000 @@ -1,6 +1,6 @@ $OpenBSD: patch-configure,v 1.36 2013/04/08 17:06:56 brad Exp $ ---- configure.orig Tue Mar 12 22:35:42 2013 -+++ configure Wed Mar 13 01:50:12 2013 +--- configure.orig Thu May 30 18:54:00 2013 ++++ configure Wed Jun 12 16:02:21 2013 @@ -1438,7 +1438,6 @@ HAVE_LIST=" machine_ioctl_bt848_h machine_ioctl_meteor_h @@ -9,7 +9,7 @@ $OpenBSD: patch-configure,v 1.36 2013/04 MapViewOfFile memalign mkstemp -@@ -3229,7 +3228,7 @@ case $target_os in +@@ -3232,7 +3231,7 @@ case $target_os in openbsd|bitrig) disable symver SHFLAGS='-shared' @@ -18,7 +18,7 @@ $OpenBSD: patch-configure,v 1.36 2013/04 SLIB_INSTALL_LINKS= oss_indev_extralibs="-lossaudio" oss_outdev_extralibs="-lossaudio" -@@ -3516,7 +3515,7 @@ die_license_disabled version3 libvo_amrwbenc +@@ -3519,7 +3518,7 @@ die_license_disabled version3 libvo_amrwbenc enabled version3 && { enabled gpl && enable gplv3 || enable lgplv3; } @@ -27,7 +27,7 @@ $OpenBSD: patch-configure,v 1.36 2013/04 enable_pic() { enable pic -@@ -4080,7 +4079,6 @@ enabled extra_warnings && check_cflags -Winline +@@ -4079,7 +4078,6 @@ enabled extra_warnings && check_cflags -Winline # add some linker flags check_ldflags -Wl,--warn-common check_ldflags -Wl,-rpath-link=libpostproc:libswresample:libswscale:libavfilter:libavdevice:libavformat:libavcodec:libavutil:libavresample @@ -35,7 +35,7 @@ $OpenBSD: patch-configure,v 1.36 2013/04 enabled xmm_clobber_test && check_ldflags -Wl,--wrap,avcodec_open2 \ -@@ -4547,6 +4545,7 @@ pkgconfig_generate(){ +@@ -4546,6 +4544,7 @@ pkgconfig_generate(){ version=$3 libs=$4 requires=$5 @@ -43,7 +43,7 @@ $OpenBSD: patch-configure,v 1.36 2013/04 enabled ${name#lib} || return 0 mkdir -p $name cat <<EOF > $name/$name${build_suffix}.pc -@@ -4561,7 +4560,7 @@ Version: $version +@@ -4560,7 +4559,7 @@ Version: $version Requires: $(enabled shared || echo $requires) Requires.private: $(enabled shared && echo $requires) Conflicts: @@ -52,7 +52,7 @@ $OpenBSD: patch-configure,v 1.36 2013/04 Libs.private: $(enabled shared && echo $libs) Cflags: -I\${includedir} EOF -@@ -4597,15 +4596,15 @@ libavfilter_pc_deps=${libavfilter_pc_deps%, } +@@ -4596,15 +4595,15 @@ libavfilter_pc_deps=${libavfilter_pc_deps%, } libavdevice_pc_deps="libavformat${build_suffix} = $LIBAVFORMAT_VERSION" enabled lavfi_indev && prepend libavdevice_pc_deps "libavfilter${build_suffix} = $LIBAVFILTER_VERSION," Index: graphics/ffmpeg/patches/patch-libavcodec_aacenc_c =================================================================== RCS file: graphics/ffmpeg/patches/patch-libavcodec_aacenc_c diff -N graphics/ffmpeg/patches/patch-libavcodec_aacenc_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ graphics/ffmpeg/patches/patch-libavcodec_aacenc_c 12 Jun 2013 23:36:14 -0000 @@ -0,0 +1,24 @@ +$OpenBSD$ + +Fix erasure of surround channels. + +--- libavcodec/aacenc.c.orig Wed Jun 12 19:09:49 2013 ++++ libavcodec/aacenc.c Wed Jun 12 19:10:53 2013 +@@ -593,7 +593,7 @@ static int aac_encode_frame(AVCodecContext *avctx, AVP + coeffs[ch] = cpe->ch[ch].coeffs; + s->psy.model->analyze(&s->psy, start_ch, coeffs, wi); + for (ch = 0; ch < chans; ch++) { +- s->cur_channel = start_ch * 2 + ch; ++ s->cur_channel = start_ch + ch; + s->coder->search_for_quantizers(avctx, s, &cpe->ch[ch], s->lambda); + } + cpe->common_window = 0; +@@ -609,7 +609,7 @@ static int aac_encode_frame(AVCodecContext *avctx, AVP + } + } + } +- s->cur_channel = start_ch * 2; ++ s->cur_channel = start_ch; + if (s->options.stereo_mode && cpe->common_window) { + if (s->options.stereo_mode > 0) { + IndividualChannelStream *ics = &cpe->ch[0].ics; Index: graphics/ffmpeg/patches/patch-libavcodec_aacps_c =================================================================== RCS file: graphics/ffmpeg/patches/patch-libavcodec_aacps_c diff -N graphics/ffmpeg/patches/patch-libavcodec_aacps_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ graphics/ffmpeg/patches/patch-libavcodec_aacps_c 12 Jun 2013 23:33:55 -0000 @@ -0,0 +1,16 @@ +$OpenBSD$ + +Correct opdipd code to match spec. This fixes out of array reads. + +--- libavcodec/aacps.c.orig Wed Jun 12 19:06:09 2013 ++++ libavcodec/aacps.c Wed Jun 12 19:07:00 2013 +@@ -823,7 +823,8 @@ static void stereo_processing(PSContext *ps, float (*l + h12 = H_LUT[iid_mapped[e][b] + 7 + 23 * ps->iid_quant][icc_mapped[e][b]][1]; + h21 = H_LUT[iid_mapped[e][b] + 7 + 23 * ps->iid_quant][icc_mapped[e][b]][2]; + h22 = H_LUT[iid_mapped[e][b] + 7 + 23 * ps->iid_quant][icc_mapped[e][b]][3]; +- if (!PS_BASELINE && ps->enable_ipdopd && b < ps->nr_ipdopd_par) { ++ ++ if (!PS_BASELINE && ps->enable_ipdopd && 2*b <= NR_PAR_BANDS[is34]) { + //The spec say says to only run this smoother when enable_ipdopd + //is set but the reference decoder appears to run it constantly + float h11i, h12i, h21i, h22i; Index: graphics/ffmpeg/patches/patch-libavcodec_aacpsy_c =================================================================== RCS file: graphics/ffmpeg/patches/patch-libavcodec_aacpsy_c diff -N graphics/ffmpeg/patches/patch-libavcodec_aacpsy_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ graphics/ffmpeg/patches/patch-libavcodec_aacpsy_c 12 Jun 2013 23:33:47 -0000 @@ -0,0 +1,15 @@ +$OpenBSD$ + +Fix a rounding bug in channel bitrate computation. + +--- libavcodec/aacpsy.c.orig Wed Jun 12 19:15:13 2013 ++++ libavcodec/aacpsy.c Wed Jun 12 19:15:52 2013 +@@ -312,7 +312,7 @@ static av_cold int psy_3gpp_init(FFPsyContext *ctx) { + AacPsyCoeffs *coeffs = pctx->psy_coef[j]; + const uint8_t *band_sizes = ctx->bands[j]; + float line_to_frequency = ctx->avctx->sample_rate / (j ? 256.f : 2048.0f); +- float avg_chan_bits = chan_bitrate / ctx->avctx->sample_rate * (j ? 128.0f : 1024.0f); ++ float avg_chan_bits = chan_bitrate * (j ? 128.0f : 1024.0f) / ctx->avctx->sample_rate; + /* reference encoder uses 2.4% here instead of 60% like the spec says */ + float bark_pe = 0.024f * PSY_3GPP_BITS_TO_PE(avg_chan_bits) / num_bark; + float en_spread_low = j ? PSY_3GPP_EN_SPREAD_LOW_S : PSY_3GPP_EN_SPREAD_LOW_L; Index: x11/mplayer/Makefile =================================================================== RCS file: /home/cvs/ports/x11/mplayer/Makefile,v retrieving revision 1.221 diff -u -p -r1.221 Makefile --- x11/mplayer/Makefile 5 May 2013 21:11:32 -0000 1.221 +++ x11/mplayer/Makefile 12 Jun 2013 21:39:44 -0000 @@ -8,8 +8,8 @@ ONLY_FOR_ARCHS = ${GCC4_ARCHS} COMMENT = movie player supporting many formats V = 20130214 -FFMPEG_V = 20130319 -REVISION = 4 +FFMPEG_V = 20130612 +REVISION = 5 SUBST_VARS += PREFIX CONFDIR Index: x11/mplayer/patches/patch-Makefile =================================================================== RCS file: /home/cvs/ports/x11/mplayer/patches/patch-Makefile,v retrieving revision 1.25 diff -u -p -r1.25 patch-Makefile --- x11/mplayer/patches/patch-Makefile 13 Mar 2013 02:28:11 -0000 1.25 +++ x11/mplayer/patches/patch-Makefile 5 Jun 2013 02:14:08 -0000 @@ -1,6 +1,6 @@ $OpenBSD: patch-Makefile,v 1.25 2013/03/13 02:28:11 brad Exp $ ---- Makefile.orig Sun Jan 13 23:53:54 2013 -+++ Makefile Mon Jan 21 11:45:15 2013 +--- Makefile.orig Thu Feb 14 14:46:11 2013 ++++ Makefile Tue Jun 4 22:13:48 2013 @@ -35,6 +35,7 @@ OS_FEATURE-$(VSSCANF) += osdep/vsscanf. # conditional source declarations SRCS_AUDIO_INPUT-$(ALSA) += stream/ai_alsa.c @@ -27,30 +27,3 @@ $OpenBSD: patch-Makefile,v 1.25 2013/03/ SRCS_MENCODER-$(FAAC) += libmpcodecs/ae_faac.c -@@ -767,7 +770,7 @@ mencoder$(EXESUF) mplayer$(EXESUF): - $(CC) -o $@ $^ $(EXTRALIBS) - - codec-cfg$(EXESUF): codec-cfg.c codec-cfg.h help_mp.h -- $(HOST_CC) -O -DCODECS2HTML -I. -Iffmpeg -o $@ $< -+ $(HOST_CC) ${CFLAGS} -O -DCODECS2HTML -I. -Iffmpeg -o $@ $< - - codecs.conf.h: codec-cfg$(EXESUF) etc/codecs.conf - ./$^ > $@ -@@ -855,7 +858,16 @@ loader/%: CFLAGS += -fno-omit-frame-pointer $(CFLAGS_N - #loader/%: CFLAGS += -Ddbg_printf=__vprintf -DTRACE=__vprintf -DDETAILED_OUT - loader/win32%: CFLAGS += $(CFLAGS_STACKREALIGN) - --mp3lib/decode_i586%: CFLAGS += -fomit-frame-pointer -+ifdef ARCH_X86_32 -+ifeq (,$(findstring -O,$(CFLAGS))) -+mp3lib/decode_i586.o: CFLAGS += -O -+mp3lib/dct64_sse.o: CFLAGS += -O -+liba52/imdct.o: CFLAGS += -O -+endif -+mp3lib/decode_i586.o: CFLAGS += -fomit-frame-pointer -+mp3lib/dct64_sse.o: CFLAGS += -fomit-frame-pointer -+liba52/imdct.o: CFLAGS += -fomit-frame-pointer -+endif - - stream/stream_dvdnav%: CFLAGS := $(CFLAGS_LIBDVDNAV) $(CFLAGS) - -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.