Here is an update of FFmpeg to the 2.2 branch and an update to newer MPlayer.

Already run through a bulk and everything in the tree has been fixed
to use the newer API.

OK?


Index: graphics/ffmpeg/Makefile
===================================================================
RCS file: /home/cvs/ports/graphics/ffmpeg/Makefile,v
retrieving revision 1.102
diff -u -p -u -p -r1.102 Makefile
--- graphics/ffmpeg/Makefile    28 Dec 2013 00:40:05 -0000      1.102
+++ graphics/ffmpeg/Makefile    28 Apr 2014 19:40:28 -0000
@@ -2,23 +2,22 @@
 
 COMMENT=       audio/video converter and streamer
 
-V=             20131216
+V=             20140412
 DISTNAME=      ffmpeg-git-${V}
 PKGNAME=       ffmpeg-${V}
-REVISION=      0
 CATEGORIES=    graphics multimedia
 MASTER_SITES=  http://comstyle.com/source/
 EXTRACT_SUFX=  .tar.xz
 
-SHARED_LIBS=   avcodec         19.1 \
-               avdevice        7.1 \
-               avfilter        5.1 \
-               avformat        17.1 \
-               avresample      0.0 \
-               avutil          11.1 \
-               postproc        15.1 \
-               swresample      0.1 \
-               swscale         5.1
+SHARED_LIBS=   avcodec         20.0 \
+               avdevice        8.0 \
+               avfilter        6.0 \
+               avformat        18.0 \
+               avresample      0.1 \
+               avutil          11.2 \
+               postproc        15.2 \
+               swresample      0.2 \
+               swscale         5.2
 
 HOMEPAGE=      http://ffmpeg.org/
 
@@ -28,9 +27,9 @@ MAINTAINER=   Brad Smith <b...@comstyle.co
 PERMIT_PACKAGE_CDROM=  patents
 PERMIT_PACKAGE_FTP=    Yes
 
-WANTLIB=       SDL X11 Xext Xfixes bz2 c crypto gsm m mp3lame opus \
+WANTLIB=       SDL X11 Xext Xfixes Xv bz2 c crypto gsm m mp3lame opus \
                pthread schroedinger-1.0>=2 sndio speex ssl theoradec \
-               theoraenc vorbis vorbisenc vpx x264>=8 xvidcore z
+               theoraenc vorbis vorbisenc vpx>=5 x264>=8 xvidcore z
 
 BUILD_DEPENDS= textproc/texi2html
 .if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"
@@ -44,18 +43,18 @@ LIB_DEPENDS=        archivers/bzip2 \
                audio/gsm \
                devel/sdl \
                multimedia/libtheora \
-               multimedia/libvpx \
+               multimedia/libvpx>=1.3.0 \
                multimedia/schroedinger>=1.0.10 \
                multimedia/x264>=20111027 \
                multimedia/xvidcore
 
 # inter-library dependencies for the current configuration
 LIBavcodec_EXTRALIBS=-L${LOCALBASE}/lib -lgsm -lmp3lame -lopus 
-lschroedinger-1.0 -lspeex -ltheoradec -ltheoraenc -lvorbis -lvorbisenc -lvpx 
-lx264 -lxvidcore -lz -pthread
-LIBavdevice_EXTRALIBS=-L${X11BASE}/lib -lX11 -lXext -lXfixes -lsndio
+LIBavdevice_EXTRALIBS=-L${X11BASE}/lib -lX11 -lXext -lXfixes -lXv -lsndio
 LIBavfilter_EXTRALIBS=
 LIBavformat_EXTRALIBS=-L${LOCALBASE}/lib -lbz2 -lssl -lcrypto -pthread
 LIBavresample_EXTRALIBS=
-LIBavutil_EXTRALIBS=-lm
+LIBavutil_EXTRALIBS=-lm -pthread
 LIBpostproc_EXTRALIBS=
 LIBswresample_EXTRALIBS=-lm
 LIBswscale_EXTRALIBS=-lm
Index: graphics/ffmpeg/distinfo
===================================================================
RCS file: /home/cvs/ports/graphics/ffmpeg/distinfo,v
retrieving revision 1.29
diff -u -p -u -p -r1.29 distinfo
--- graphics/ffmpeg/distinfo    24 Dec 2013 15:22:55 -0000      1.29
+++ graphics/ffmpeg/distinfo    12 Apr 2014 20:55:01 -0000
@@ -1,2 +1,2 @@
-SHA256 (ffmpeg-git-20131216.tar.xz) = 
2TSLqsaBE079+PtSk+cIsB2pfsWEeN7fkvVV+WL+Z0U=
-SIZE (ffmpeg-git-20131216.tar.xz) = 4918156
+SHA256 (ffmpeg-git-20140412.tar.xz) = 
yst7treEQowV/1kBZtpjphZ8AEtjUOqLzrTJUPGA2hc=
+SIZE (ffmpeg-git-20140412.tar.xz) = 5792316
Index: graphics/ffmpeg/patches/patch-configure
===================================================================
RCS file: /home/cvs/ports/graphics/ffmpeg/patches/patch-configure,v
retrieving revision 1.38
diff -u -p -u -p -r1.38 patch-configure
--- graphics/ffmpeg/patches/patch-configure     24 Dec 2013 15:22:55 -0000      
1.38
+++ graphics/ffmpeg/patches/patch-configure     25 Mar 2014 03:12:46 -0000
@@ -1,15 +1,15 @@
 $OpenBSD: patch-configure,v 1.38 2013/12/24 15:22:55 brad Exp $
---- configure.orig     Mon Dec 16 20:09:44 2013
-+++ configure  Thu Dec 19 17:13:54 2013
-@@ -1438,7 +1438,6 @@ HAVE_LIST="
-     machine_ioctl_bt848_h
+--- configure.orig     Mon Mar 24 23:08:28 2014
++++ configure  Mon Mar 24 23:12:38 2014
+@@ -1606,7 +1606,6 @@ HAVE_LIST="
      machine_ioctl_meteor_h
+     machine_rw_barrier
      makeinfo
 -    malloc_h
      MapViewOfFile
      memalign
-     mkstemp
-@@ -3234,7 +3233,7 @@ case $target_os in
+     MemoryBarrier
+@@ -3723,7 +3722,7 @@ case $target_os in
      openbsd|bitrig)
          disable symver
          SHFLAGS='-shared'
@@ -18,24 +18,24 @@ $OpenBSD: patch-configure,v 1.38 2013/12
          SLIB_INSTALL_LINKS=
          oss_indev_extralibs="-lossaudio"
          oss_outdev_extralibs="-lossaudio"
-@@ -3521,7 +3520,7 @@ die_license_disabled version3 libvo_amrwbenc
+@@ -4054,7 +4053,7 @@ die_license_disabled version3 libvo_amrwbenc
  
  enabled version3 && { enabled gpl && enable gplv3 || enable lgplv3; }
  
 -disabled optimizations || check_cflags -fomit-frame-pointer
 +enabled x86_32 && check_cflags -fomit-frame-pointer
  
- enable_pic() {
-     enable pic
-@@ -4081,7 +4080,6 @@ enabled extra_warnings && check_cflags -Winline
- # add some linker flags
+ enable_weak_pic() {
+     disabled pic && return
+@@ -4695,7 +4694,6 @@ check_disable_warning -Wno-pointer-sign
  check_ldflags -Wl,--warn-common
  check_ldflags 
-Wl,-rpath-link=libpostproc:libswresample:libswscale:libavfilter:libavdevice:libavformat:libavcodec:libavutil:libavresample
+ enabled rpath && add_ldflags -Wl,-rpath=$libdir
 -test_ldflags -Wl,-Bsymbolic && append SHFLAGS -Wl,-Bsymbolic
  
- enabled xmm_clobber_test &&
-     check_ldflags -Wl,--wrap,avcodec_open2              \
-@@ -4548,6 +4546,7 @@ pkgconfig_generate(){
+ # add some strip flags
+ # -wN '..@*' is more selective than -x, but not available everywhere.
+@@ -5245,6 +5243,7 @@ pkgconfig_generate(){
      version=$3
      libs=$4
      requires=$5
@@ -43,37 +43,34 @@ $OpenBSD: patch-configure,v 1.38 2013/12
      enabled ${name#lib} || return 0
      mkdir -p $name
      cat <<EOF > $name/$name${build_suffix}.pc
-@@ -4562,7 +4561,7 @@ Version: $version
+@@ -5259,7 +5258,7 @@ Version: $version
  Requires: $(enabled shared || echo $requires)
  Requires.private: $(enabled shared && echo $requires)
  Conflicts:
--Libs: -L\${libdir} -l${shortname} $(enabled shared || echo $libs)
-+Libs: -L\${libdir} -l${shortname} $(enabled shared || echo $libs) $linkflags
+-Libs: -L\${libdir} $(enabled rpath && echo "-Wl,-rpath,\${libdir}") 
-l${shortname} $(enabled shared || echo $libs)
++Libs: -L\${libdir} $(enabled rpath && echo "-Wl,-rpath,\${libdir}") 
-l${shortname} $(enabled shared || echo $libs) $linkflags
  Libs.private: $(enabled shared && echo $libs)
  Cflags: -I\${includedir}
  EOF
-@@ -4598,15 +4597,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,"
- 
--pkgconfig_generate libavutil "FFmpeg utility library" "$LIBAVUTIL_VERSION" 
"$LIBM"
--pkgconfig_generate libavcodec "FFmpeg codec library" "$LIBAVCODEC_VERSION" 
"$extralibs" "libavutil${build_suffix} = $LIBAVUTIL_VERSION"
--pkgconfig_generate libavformat "FFmpeg container format library" 
"$LIBAVFORMAT_VERSION" "$extralibs" "libavcodec${build_suffix} = 
$LIBAVCODEC_VERSION"
--pkgconfig_generate libavdevice "FFmpeg device handling library" 
"$LIBAVDEVICE_VERSION" "$extralibs" "$libavdevice_pc_deps"
--pkgconfig_generate libavfilter "FFmpeg audio/video filtering library" 
"$LIBAVFILTER_VERSION" "$extralibs" "$libavfilter_pc_deps"
--pkgconfig_generate libpostproc "FFmpeg postprocessing library" 
"$LIBPOSTPROC_VERSION" "" "libavutil${build_suffix} = $LIBAVUTIL_VERSION"
--pkgconfig_generate libavresample "Libav audio resampling library" 
"$LIBAVRESAMPLE_VERSION" "$extralibs" "libavutil${build_suffix} = 
$LIBAVUTIL_VERSION"
--pkgconfig_generate libswscale "FFmpeg image rescaling library" 
"$LIBSWSCALE_VERSION" "$LIBM" "libavutil${build_suffix} = $LIBAVUTIL_VERSION"
--pkgconfig_generate libswresample "FFmpeg audio resampling library" 
"$LIBSWRESAMPLE_VERSION" "$LIBM" "libavutil${build_suffix} = $LIBAVUTIL_VERSION"
-+pkgconfig_generate libavutil "FFmpeg utility library" "$LIBAVUTIL_VERSION" 
"$LIBavutil_EXTRALIBS" "$LIBavutil_REQUIRES" "$LIBavutil_LINKFLAGS"
-+pkgconfig_generate libavcodec "FFmpeg codec library" "$LIBAVCODEC_VERSION" 
"$LIBavcodec_EXTRALIBS" "$LIBavcodec_REQUIRES" "$LIBavcodec_LINKFLAGS"
-+pkgconfig_generate libavformat "FFmpeg container format library" 
"$LIBAVFORMAT_VERSION" "$LIBavformat_EXTRALIBS" "$LIBavformat_REQUIRES" 
"$LIBavformat_LINKFLAGS"
-+pkgconfig_generate libavdevice "FFmpeg device handling library" 
"$LIBAVDEVICE_VERSION" "$LIBavdevice_EXTRALIBS" "$LIBavdevice_REQUIRES" 
"$LIBavdevice_LINKFLAGS"
-+pkgconfig_generate libavfilter "FFmpeg video filtering library" 
"$LIBAVFILTER_VERSION" "$LIBavfilter_EXTRALIBS" "$LIBavfilter_REQUIRES" 
"$LIBavfilter_LINKFLAGS"
-+pkgconfig_generate libpostproc "FFmpeg post processing library" 
"$LIBPOSTPROC_VERSION" "$LIBpostproc_EXTRALIBS" "$LIBpostproc_REQUIRES" 
"$LIBpostproc_LINKFLAGS"
-+pkgconfig_generate libavresample "Libav audio resampling library" 
"$LIBAVRESAMPLE_VERSION" "$LIBreavsample_EXTRALIBS" "$LIBavresample_REQUIRES" 
"$LIBavresample_LINKFLAGS"
-+pkgconfig_generate libswscale "FFmpeg image rescaling library" 
"$LIBSWSCALE_VERSION" "$LIBswscale_EXTRALIBS" "$LIBswscale_REQUIRES" 
"$LIBswscale_LINKFLAGS"
-+pkgconfig_generate libswresample "FFmpeg audio rescaling library" 
"$LIBSWRESAMPLE_VERSION" "$LIBswresample_EXTRALIBS" "$LIBswresample_REQUIRES" 
"$LIBswresample_LINKFLAGS"
- 
- fix_ffmpeg_remote(){
-     git_remote_from=$1
+@@ -5295,12 +5294,12 @@ lavfi_libs=${lavfi_libs%, }
+ lavd_libs="libavformat${build_suffix} = $LIBAVFORMAT_VERSION"
+ enabled lavfi_indev && prepend lavd_libs "libavfilter${build_suffix} = 
$LIBAVFILTER_VERSION,"
+ 
+-pkgconfig_generate libavutil     "FFmpeg utility library"               
"$LIBAVUTIL_VERSION"     "$LIBM"
+-pkgconfig_generate libavcodec    "FFmpeg codec library"                 
"$LIBAVCODEC_VERSION"    "$extralibs" "libavutil${build_suffix} = 
$LIBAVUTIL_VERSION"
+-pkgconfig_generate libavformat   "FFmpeg container format library"      
"$LIBAVFORMAT_VERSION"   "$extralibs" "libavcodec${build_suffix} = 
$LIBAVCODEC_VERSION"
+-pkgconfig_generate libavdevice   "FFmpeg device handling library"       
"$LIBAVDEVICE_VERSION"   "$extralibs" "$lavd_libs"
+-pkgconfig_generate libavfilter   "FFmpeg audio/video filtering library" 
"$LIBAVFILTER_VERSION"   "$extralibs" "$lavfi_libs"
+-pkgconfig_generate libpostproc   "FFmpeg postprocessing library"        
"$LIBPOSTPROC_VERSION"   ""           "libavutil${build_suffix} = 
$LIBAVUTIL_VERSION"
+-pkgconfig_generate libavresample "Libav audio resampling library"       
"$LIBAVRESAMPLE_VERSION" "$extralibs" "libavutil${build_suffix} = 
$LIBAVUTIL_VERSION"
+-pkgconfig_generate libswscale    "FFmpeg image rescaling library"       
"$LIBSWSCALE_VERSION"    "$LIBM"      "libavutil${build_suffix} = 
$LIBAVUTIL_VERSION"
+-pkgconfig_generate libswresample "FFmpeg audio resampling library"      
"$LIBSWRESAMPLE_VERSION" "$LIBM"      "libavutil${build_suffix} = 
$LIBAVUTIL_VERSION"
++pkgconfig_generate libavutil     "FFmpeg utility library"               
"$LIBAVUTIL_VERSION"     "$LIBavutil_EXTRALIBS"     "$LIBavutil_REQUIRES"     
"$LIBavutil_LINKFLAGS"
++pkgconfig_generate libavcodec    "FFmpeg codec library"                 
"$LIBAVCODEC_VERSION"    "$LIBavcodec_EXTRALIBS"    "$LIBavcodec_REQUIRES"    
"$LIBavcodec_LINKFLAGS"
++pkgconfig_generate libavformat   "FFmpeg container format library"      
"$LIBAVFORMAT_VERSION"   "$LIBavformat_EXTRALIBS"   "$LIBavformat_REQUIRES"   
"$LIBavformat_LINKFLAGS"
++pkgconfig_generate libavdevice   "FFmpeg device handling library"       
"$LIBAVDEVICE_VERSION"   "$LIBavdevice_EXTRALIBS"   "$LIBavdevice_REQUIRES"   
"$LIBavdevice_LINKFLAGS"
++pkgconfig_generate libavfilter   "FFmpeg audio/video filtering library" 
"$LIBAVFILTER_VERSION"   "$LIBavfilter_EXTRALIBS"   "$LIBavfilter_REQUIRES"   
"$LIBavfilter_LINKFLAGS"
++pkgconfig_generate libpostproc   "FFmpeg postprocessing library"        
"$LIBPOSTPROC_VERSION"   "$LIBpostproc_EXTRALIBS"   "$LIBpostproc_REQUIRES"   
"$LIBpostproc_LINKFLAGS"
++pkgconfig_generate libavresample "Libav audio resampling library"       
"$LIBAVRESAMPLE_VERSION" "$LIBreavsample_EXTRALIBS" "$LIBavresample_REQUIRES" 
"$LIBavresample_LINKFLAGS"
++pkgconfig_generate libswscale    "FFmpeg image rescaling library"       
"$LIBSWSCALE_VERSION"    "$LIBswscale_EXTRALIBS"    "$LIBswscale_REQUIRES"    
"$LIBswscale_LINKFLAGS"
++pkgconfig_generate libswresample "FFmpeg audio rescaling library"       
"$LIBSWRESAMPLE_VERSION" "$LIBswresample_EXTRALIBS" "$LIBswresample_REQUIRES" 
"$LIBswresample_LINKFLAGS"
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
--- graphics/ffmpeg/patches/patch-libavcodec_aacenc_c   19 Aug 2013 14:38:29 
-0000      1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,24 +0,0 @@
-$OpenBSD: patch-libavcodec_aacenc_c,v 1.1 2013/08/19 14:38:29 brad Exp $
-
-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
--- graphics/ffmpeg/patches/patch-libavcodec_aacps_c    19 Aug 2013 14:38:29 
-0000      1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$OpenBSD: patch-libavcodec_aacps_c,v 1.1 2013/08/19 14:38:29 brad Exp $
-
-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
--- graphics/ffmpeg/patches/patch-libavcodec_aacpsy_c   19 Aug 2013 14:38:29 
-0000      1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-$OpenBSD: patch-libavcodec_aacpsy_c,v 1.1 2013/08/19 14:38:29 brad Exp $
-
-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: graphics/ffmpeg/patches/patch-library_mak
===================================================================
RCS file: /home/cvs/ports/graphics/ffmpeg/patches/patch-library_mak,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-library_mak
--- graphics/ffmpeg/patches/patch-library_mak   8 Apr 2013 17:06:56 -0000       
1.3
+++ graphics/ffmpeg/patches/patch-library_mak   25 Mar 2014 03:11:45 -0000
@@ -1,16 +1,16 @@
 $OpenBSD: patch-library_mak,v 1.3 2013/04/08 17:06:56 brad Exp $
---- library.mak.orig   Tue Mar 12 22:35:44 2013
-+++ library.mak        Tue Mar 12 23:30:11 2013
-@@ -54,7 +54,7 @@ $(SUBDIR)$(SLIBNAME): $(SUBDIR)$(SLIBNAME_WITH_MAJOR)
+--- library.mak.orig   Tue Mar 11 01:57:35 2014
++++ library.mak        Tue Mar 11 02:39:44 2014
+@@ -53,7 +53,7 @@ $(SUBDIR)$(SLIBNAME): $(SUBDIR)$(SLIBNAME_WITH_MAJOR)
  
- $(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(OBJS) $(SUBDIR)lib$(NAME).ver
+ $(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(OBJS) $(SLIBOBJS) $(SUBDIR)lib$(NAME).ver
        $(SLIB_CREATE_DEF_CMD)
 -      $$(LD) $(SHFLAGS) $(LDFLAGS) $$(LD_O) $$(filter %.o,$$^) $(FFEXTRALIBS)
 +      $$(LD) $(SHFLAGS) $(LDFLAGS) $$(LD_O) $$(filter %.o,$$^) 
$(LIB$(NAME)_EXTRALIBS)
        $(SLIB_EXTRA_CMD)
  
  ifdef SUBDIR
-@@ -71,8 +71,6 @@ distclean:: clean
+@@ -70,8 +70,6 @@ distclean:: clean
  install-lib$(NAME)-shared: $(SUBDIR)$(SLIBNAME)
        $(Q)mkdir -p "$(SHLIBDIR)"
        $$(INSTALL) -m 755 $$< "$(SHLIBDIR)/$(SLIB_INSTALL_NAME)"
Index: graphics/ffmpeg/patches/patch-version_sh
===================================================================
RCS file: /home/cvs/ports/graphics/ffmpeg/patches/patch-version_sh,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 patch-version_sh
--- graphics/ffmpeg/patches/patch-version_sh    12 Apr 2011 22:59:07 -0000      
1.6
+++ graphics/ffmpeg/patches/patch-version_sh    25 Mar 2014 03:11:45 -0000
@@ -1,8 +1,9 @@
 $OpenBSD: patch-version_sh,v 1.6 2011/04/12 22:59:07 sthen Exp $
---- version.sh.orig    Mon Mar 28 22:46:40 2011
-+++ version.sh Mon Mar 28 22:48:02 2011
-@@ -1,5 +1,8 @@
- #!/bin/sh
+--- version.sh.orig    Tue Mar 11 01:57:36 2014
++++ version.sh Tue Mar 11 02:39:44 2014
+@@ -2,6 +2,9 @@
+ 
+ # Usage: version.sh <ffmpeg-root-dir> <output-version.h> <extra-version>
  
 +revision=$(cd "$1" && cat snapshot_version 2> /dev/null)
 +test "$revision" && revision=git-$revision
Index: graphics/ffmpeg/pkg/PLIST
===================================================================
RCS file: /home/cvs/ports/graphics/ffmpeg/pkg/PLIST,v
retrieving revision 1.27
diff -u -p -u -p -r1.27 PLIST
--- graphics/ffmpeg/pkg/PLIST   28 Dec 2013 00:40:05 -0000      1.27
+++ graphics/ffmpeg/pkg/PLIST   25 Mar 2014 03:11:45 -0000
@@ -46,15 +46,19 @@ include/libavutil/base64.h
 include/libavutil/blowfish.h
 include/libavutil/bprint.h
 include/libavutil/bswap.h
+include/libavutil/buffer.h
 include/libavutil/channel_layout.h
 include/libavutil/common.h
 include/libavutil/cpu.h
 include/libavutil/crc.h
 include/libavutil/dict.h
+include/libavutil/downmix_info.h
 include/libavutil/error.h
 include/libavutil/eval.h
+include/libavutil/ffversion.h
 include/libavutil/fifo.h
 include/libavutil/file.h
+include/libavutil/frame.h
 include/libavutil/hmac.h
 include/libavutil/imgutils.h
 include/libavutil/intfloat.h
@@ -63,9 +67,11 @@ include/libavutil/intreadwrite.h
 include/libavutil/lfg.h
 include/libavutil/log.h
 include/libavutil/lzo.h
+include/libavutil/macros.h
 include/libavutil/mathematics.h
 include/libavutil/md5.h
 include/libavutil/mem.h
+include/libavutil/murmur3.h
 include/libavutil/old_pix_fmts.h
 include/libavutil/opt.h
 include/libavutil/parseutils.h
@@ -73,8 +79,11 @@ include/libavutil/pixdesc.h
 include/libavutil/pixfmt.h
 include/libavutil/random_seed.h
 include/libavutil/rational.h
+include/libavutil/ripemd.h
 include/libavutil/samplefmt.h
 include/libavutil/sha.h
+include/libavutil/sha512.h
+include/libavutil/stereo3d.h
 include/libavutil/time.h
 include/libavutil/timecode.h
 include/libavutil/timestamp.h
@@ -117,6 +126,7 @@ lib/pkgconfig/libavutil.pc
 lib/pkgconfig/libpostproc.pc
 lib/pkgconfig/libswresample.pc
 lib/pkgconfig/libswscale.pc
+@man man/man1/ffmpeg-all.1
 @man man/man1/ffmpeg-bitstream-filters.1
 @man man/man1/ffmpeg-codecs.1
 @man man/man1/ffmpeg-devices.1
@@ -127,25 +137,51 @@ lib/pkgconfig/libswscale.pc
 @man man/man1/ffmpeg-scaler.1
 @man man/man1/ffmpeg-utils.1
 @man man/man1/ffmpeg.1
+@man man/man1/ffplay-all.1
 @man man/man1/ffplay.1
+@man man/man1/ffprobe-all.1
 @man man/man1/ffprobe.1
+@man man/man1/ffserver-all.1
 @man man/man1/ffserver.1
-man/man1/libavcodec.3
-man/man1/libavdevice.3
-man/man1/libavfilter.3
-man/man1/libavformat.3
-man/man1/libavutil.3
-man/man1/libswresample.3
-man/man1/libswscale.3
+@man man/man3/libavcodec.3
+@man man/man3/libavdevice.3
+@man man/man3/libavfilter.3
+@man man/man3/libavformat.3
+@man man/man3/libavutil.3
+@man man/man3/libswresample.3
+@man man/man3/libswscale.3
 share/doc/ffmpeg/
 share/doc/ffmpeg/developer.html
 share/doc/ffmpeg/faq.html
+share/doc/ffmpeg/fate.html
+share/doc/ffmpeg/ffmpeg-all.html
+share/doc/ffmpeg/ffmpeg-bitstream-filters.html
+share/doc/ffmpeg/ffmpeg-codecs.html
+share/doc/ffmpeg/ffmpeg-devices.html
+share/doc/ffmpeg/ffmpeg-filters.html
+share/doc/ffmpeg/ffmpeg-formats.html
+share/doc/ffmpeg/ffmpeg-protocols.html
+share/doc/ffmpeg/ffmpeg-resampler.html
+share/doc/ffmpeg/ffmpeg-scaler.html
+share/doc/ffmpeg/ffmpeg-utils.html
 share/doc/ffmpeg/ffmpeg.html
+share/doc/ffmpeg/ffplay-all.html
 share/doc/ffmpeg/ffplay.html
+share/doc/ffmpeg/ffprobe-all.html
 share/doc/ffmpeg/ffprobe.html
+share/doc/ffmpeg/ffserver-all.html
 share/doc/ffmpeg/ffserver.html
 share/doc/ffmpeg/general.html
+share/doc/ffmpeg/git-howto.html
+share/doc/ffmpeg/libavcodec.html
+share/doc/ffmpeg/libavdevice.html
 share/doc/ffmpeg/libavfilter.html
+share/doc/ffmpeg/libavformat.html
+share/doc/ffmpeg/libavutil.html
+share/doc/ffmpeg/libswresample.html
+share/doc/ffmpeg/libswscale.html
+share/doc/ffmpeg/nut.html
+share/doc/ffmpeg/platform.html
 share/doc/pkg-readmes/${FULLPKGNAME}
 share/examples/ffmpeg/
 share/examples/ffmpeg/ffserver.conf
@@ -153,14 +189,18 @@ share/ffmpeg/
 share/ffmpeg/examples/
 share/ffmpeg/examples/Makefile
 share/ffmpeg/examples/README
-share/ffmpeg/examples/decoding_encoding.c
-share/ffmpeg/examples/demuxing.c
+share/ffmpeg/examples/avcodec.c
+share/ffmpeg/examples/avio_reading.c
+share/ffmpeg/examples/demuxing_decoding.c
+share/ffmpeg/examples/filter_audio.c
 share/ffmpeg/examples/filtering_audio.c
 share/ffmpeg/examples/filtering_video.c
 share/ffmpeg/examples/metadata.c
 share/ffmpeg/examples/muxing.c
+share/ffmpeg/examples/remuxing.c
 share/ffmpeg/examples/resampling_audio.c
 share/ffmpeg/examples/scaling_video.c
+share/ffmpeg/examples/transcode_aac.c
 share/ffmpeg/ffprobe.xsd
 share/ffmpeg/libvpx-1080p.ffpreset
 share/ffmpeg/libvpx-1080p50_60.ffpreset
Index: x11/mplayer/Makefile
===================================================================
RCS file: /home/cvs/ports/x11/mplayer/Makefile,v
retrieving revision 1.235
diff -u -p -u -p -r1.235 Makefile
--- x11/mplayer/Makefile        19 Feb 2014 19:12:42 -0000      1.235
+++ x11/mplayer/Makefile        16 Apr 2014 04:55:22 -0000
@@ -7,15 +7,14 @@ ONLY_FOR_ARCHS =      ${GCC4_ARCHS}
 
 COMMENT =              movie player supporting many formats
 
-V =                    20140106
-FFMPEG_V =             20131216
+V =                    20140412
+FFMPEG_V =             20140412
 
 SUBST_VARS +=          PREFIX CONFDIR
 
 # Distfiles must be hand-rolled, see README
 N =                    mplayer
 DISTNAME =             mplayer-${V}
-REVISION =             3
 EXTRACT_SUFX =         .tar.xz
 
 CATEGORIES =           x11 multimedia
@@ -36,9 +35,10 @@ WANTLIB =    EGL GL X11 Xext Xinerama Xss X
 # we use a snapshot
 MASTER_SITES = http://comstyle.com/source/
 
-MAINTAINER =   Edd Barrett <e...@openbsd.org>
+MAINTAINER =   Brad Smith <b...@comstyle.com>
 
-MODULES +=     converters/libiconv
+MODULES +=     converters/libiconv \
+               lang/clang
 
 LIB_DEPENDS =  graphics/png \
                graphics/jpeg \
@@ -72,6 +72,9 @@ BUILD_DEPENDS +=graphics/ffmpeg:patch
 BUILD_DEPENDS += devel/yasm
 .endif
 
+MODCLANG_ARCHS=        amd64 i386
+MODCLANG_LANGS=        c
+
 CONFDIR =      ${SYSCONFDIR}/mplayer
 
 .if ${MACHINE_ARCH:Marm}
@@ -165,11 +168,8 @@ WANTLIB += vorbisenc vorbis
 
 CONFIGURE_ENV += LOCALBASE="${LOCALBASE}" TMPDIR="${WRKBUILD}"
 
-# binutils 2.15 does not support SSSE3 / SSE4 for amd64 / i386
 .if ${MACHINE_ARCH:Mamd64} || ${MACHINE_ARCH:Mi386}
 CONFIGURE_ARGS += --enable-runtime-cpudetection
-CONFIGURE_ARGS += --disable-ssse3
-CONFIGURE_ARGS += --disable-sse4
 .endif
 
 # binutils 2.15 assembler missing opcode support
Index: x11/mplayer/distinfo
===================================================================
RCS file: /home/cvs/ports/x11/mplayer/distinfo,v
retrieving revision 1.39
diff -u -p -u -p -r1.39 distinfo
--- x11/mplayer/distinfo        10 Jan 2014 21:52:29 -0000      1.39
+++ x11/mplayer/distinfo        12 Apr 2014 21:15:36 -0000
@@ -1,2 +1,2 @@
-SHA256 (mplayer-20140106.tar.xz) = cll7+pWtmcggOIGbFRhDZ46j4lyOt6cVpXFE7KNHGys=
-SIZE (mplayer-20140106.tar.xz) = 5277680
+SHA256 (mplayer-20140412.tar.xz) = 4KUrtyu7WIw+f1Ud14cAR+GaCNpS5FcgKDehHJxHn/c=
+SIZE (mplayer-20140412.tar.xz) = 5262184
Index: x11/mplayer/patches/patch-DOCS_man_en_mplayer_1
===================================================================
RCS file: /home/cvs/ports/x11/mplayer/patches/patch-DOCS_man_en_mplayer_1,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 patch-DOCS_man_en_mplayer_1
--- x11/mplayer/patches/patch-DOCS_man_en_mplayer_1     10 Jan 2014 21:52:29 
-0000      1.9
+++ x11/mplayer/patches/patch-DOCS_man_en_mplayer_1     27 Feb 2014 04:33:41 
-0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-DOCS_man_en_mplayer_1,v 1.9 2014/01/10 21:52:29 brad Exp $
---- DOCS/man/en/mplayer.1.orig Mon Jan  6 17:03:10 2014
-+++ DOCS/man/en/mplayer.1      Mon Jan  6 17:22:43 2014
-@@ -1542,7 +1542,7 @@ May be negative.
+--- DOCS/man/en/mplayer.1.orig Wed Feb 26 23:29:38 2014
++++ DOCS/man/en/mplayer.1      Wed Feb 26 23:31:29 2014
+@@ -1546,7 +1546,7 @@ May be negative.
  .
  .TP
  .B \-cdrom\-device <path to device>
@@ -10,7 +10,7 @@ $OpenBSD: patch-DOCS_man_en_mplayer_1,v 
  .
  .TP
  .B \-channels <number> (also see \-af channels)
-@@ -12299,11 +12299,11 @@ mplayer \-vo zr2 \-vf scale=352:288,zrmjpeg file.avi
+@@ -12313,11 +12313,11 @@ mplayer \-vo zr2 \-vf scale=352:288,zrmjpeg file.avi
  .PP
  .B Play DTS-CD with passthrough:
  .nf
Index: x11/mplayer/patches/patch-configure
===================================================================
RCS file: /home/cvs/ports/x11/mplayer/patches/patch-configure,v
retrieving revision 1.73
diff -u -p -u -p -r1.73 patch-configure
--- x11/mplayer/patches/patch-configure 10 Jan 2014 21:52:29 -0000      1.73
+++ x11/mplayer/patches/patch-configure 12 Apr 2014 21:16:07 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-configure,v 1.73 2014/01/10 21:52:29 brad Exp $
---- configure.orig     Mon Jan  6 17:03:04 2014
-+++ configure  Mon Jan  6 17:22:43 2014
-@@ -1497,36 +1497,36 @@ echo configuration: $configuration > "$TMPLOG"
+--- configure.orig     Sat Apr 12 17:12:35 2014
++++ configure  Sat Apr 12 17:15:59 2014
+@@ -1505,39 +1505,39 @@ echo configuration: $configuration > "$TMPLOG"
  echo >> "$TMPLOG"
  
  
@@ -16,19 +16,22 @@ $OpenBSD: patch-configure,v 1.73 2014/01
 +#    exit 1
 +#fi
 +#
++#FFBRANCH=master
++#test -e FFBRANCH && FFBRANCH=$(cat FFMPEG_BRANCH)
++#
 +#if test -e ffmpeg/mp_auto_pull ; then
 +#    echo "Updating FFmpeg, (re)move ffmpeg/mp_auto_pull to disable"
-+#    (cd ffmpeg && git checkout master)
++#    (cd ffmpeg && git checkout $FFBRANCH)
 +#    if ! (cd ffmpeg && git pull --rebase --ff-only) ; then
 +#        echo "git pull failed, (re)move ffmpeg/mp_auto_pull to disable 
pulling"
 +#        exit 1
 +#    fi
 +#fi
 +#
-+#if ! test -e ffmpeg ; then
++#if test "$ffmpeg_a" != "no" && ! test -e ffmpeg ; then
 +#    echo "No FFmpeg checkout, press enter to download one with git or CTRL+C 
to abort"
 +#    read tmp
-+#    if ! git clone --depth 1 git://source.ffmpeg.org/ffmpeg.git ffmpeg ; then
++#    if ! git clone -b $FFBRANCH --depth 1 git://source.ffmpeg.org/ffmpeg.git 
ffmpeg ; then
 +#        rm -rf ffmpeg
 +#        echo "Failed to get a FFmpeg checkout"
 +#        echo "Please try again or put FFmpeg source code copy into ffmpeg/ 
manually."
@@ -40,19 +43,22 @@ $OpenBSD: patch-configure,v 1.73 2014/01
 +#    touch ffmpeg/mp_auto_pull
 +#fi
  
+-FFBRANCH=master
+-test -e FFBRANCH && FFBRANCH=$(cat FFMPEG_BRANCH)
+-
 -if test -e ffmpeg/mp_auto_pull ; then
 -    echo "Updating FFmpeg, (re)move ffmpeg/mp_auto_pull to disable"
--    (cd ffmpeg && git checkout master)
+-    (cd ffmpeg && git checkout $FFBRANCH)
 -    if ! (cd ffmpeg && git pull --rebase --ff-only) ; then
 -        echo "git pull failed, (re)move ffmpeg/mp_auto_pull to disable 
pulling"
 -        exit 1
 -    fi
 -fi
 -
--if ! test -e ffmpeg ; then
+-if test "$ffmpeg_a" != "no" && ! test -e ffmpeg ; then
 -    echo "No FFmpeg checkout, press enter to download one with git or CTRL+C 
to abort"
 -    read tmp
--    if ! git clone --depth 1 git://source.ffmpeg.org/ffmpeg.git ffmpeg ; then
+-    if ! git clone -b $FFBRANCH --depth 1 git://source.ffmpeg.org/ffmpeg.git 
ffmpeg ; then
 -        rm -rf ffmpeg
 -        echo "Failed to get a FFmpeg checkout"
 -        echo "Please try again or put FFmpeg source code copy into ffmpeg/ 
manually."
@@ -65,9 +71,9 @@ $OpenBSD: patch-configure,v 1.73 2014/01
 -fi
 -
  list_subparts() {
+   test ! -e ffmpeg/libav${3} && return 1
    pattern="s/^[^#]*${1}.*([^ ,]*, *\([^ ,)]*\).*/\1_${2}/p"
-   sed -n "$pattern" ffmpeg/libav${3} | toupper
-@@ -2364,7 +2364,7 @@ case "$host_arch" in
+@@ -2390,7 +2390,7 @@ case "$host_arch" in
      arch='sparc'
      iproc='sparc'
      if test "$host_arch" = "sparc64" ; then
@@ -76,7 +82,7 @@ $OpenBSD: patch-configure,v 1.73 2014/01
        proc='ultrasparc'
        def_fast_64bit='#define HAVE_FAST_64BIT 1'
      elif sunos ; then
-@@ -2692,7 +2692,7 @@ cat > $TMPC << EOF
+@@ -2724,7 +2724,7 @@ cat > $TMPC << EOF
  int ff_extern;
  EOF
  cc_check -c || die "Symbol mangling check failed."
@@ -85,7 +91,16 @@ $OpenBSD: patch-configure,v 1.73 2014/01
  extern_prefix=${sym%%ff_extern*}
  def_extern_asm="#define EXTERN_ASM $extern_prefix"
  def_extern_prefix="#define EXTERN_PREFIX \"$extern_prefix\""
-@@ -6153,7 +6153,7 @@ echocheck "cdparanoia"
+@@ -2852,7 +2852,7 @@ elif test $relocatable = "yes" ; then
+ fi
+ echores $relocatable
+ 
+-if x86_32 ; then
++if false ; then # x86_32
+   # Checking assembler (_as) compatibility...
+   # Added workaround for older as that reads from stdin by default - atmos
+   as_version=$(echo '' | $_as -version 2>&1 | sed -n 's/^.*assembler 
\(version \)*\([0-9.]*\).*$/\2/p')
+@@ -6191,7 +6191,7 @@ echocheck "cdparanoia"
  if test "$_cdparanoia" = auto ; then
      _cdparanoia=no
      for inc_tmp in "" "-I/usr/include/cdda" "-I/usr/local/include/cdda" ; do
@@ -94,7 +109,7 @@ $OpenBSD: patch-configure,v 1.73 2014/01
          _cdparanoia=yes && extra_cflags="$extra_cflags $inc_tmp" && break
      done
  fi
-@@ -8099,6 +8099,7 @@ extra_ldflags="$extra_ldflags $libm"
+@@ -8146,6 +8146,7 @@ extra_ldflags="$extra_ldflags $libm"
  # XML documentation tests
  echocheck "XML catalogs"
  for try_catalog in \
@@ -102,7 +117,7 @@ $OpenBSD: patch-configure,v 1.73 2014/01
    /etc/sgml/catalog \
    /usr/share/xml/docbook/*/catalog.xml \
    /opt/local/share/xml/docbook-xml/*/catalog.xml \
-@@ -8126,6 +8127,7 @@ fi
+@@ -8173,6 +8174,7 @@ fi
  
  echocheck "XML chunked stylesheet"
  for try_chunk_xsl in \
@@ -110,7 +125,7 @@ $OpenBSD: patch-configure,v 1.73 2014/01
    /usr/share/xml/docbook/*/html/chunk.xsl \
    /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/html/chunk.xsl \
    /usr/share/sgml/docbook/yelp/docbook/html/chunk.xsl \
-@@ -8151,6 +8153,7 @@ fi
+@@ -8198,6 +8200,7 @@ fi
  
  echocheck "XML monolithic stylesheet"
  for try_docbook_xsl in \
@@ -118,7 +133,7 @@ $OpenBSD: patch-configure,v 1.73 2014/01
    /usr/share/xml/docbook/*/html/docbook.xsl \
    /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/html/docbook.xsl \
    /usr/share/sgml/docbook/yelp/docbook/html/docbook.xsl \
-@@ -8204,6 +8207,7 @@ EOF
+@@ -8251,6 +8254,7 @@ EOF
  echocheck "XML DTD"
  #FIXME: This should prefer higher version numbers, not the other way around ..
  for try_dtd in \
Index: x11/mplayer/patches/patch-fmt-conversion_c
===================================================================
RCS file: x11/mplayer/patches/patch-fmt-conversion_c
diff -N x11/mplayer/patches/patch-fmt-conversion_c
--- x11/mplayer/patches/patch-fmt-conversion_c  6 Sep 2013 23:14:40 -0000       
1.4
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,19 +0,0 @@
-$OpenBSD: patch-fmt-conversion_c,v 1.4 2013/09/06 23:14:40 brad Exp $
-
-Deal with older FFmpeg.
-
---- fmt-conversion.c.orig      Tue Aug 20 02:57:56 2013
-+++ fmt-conversion.c   Tue Aug 20 03:08:51 2013
-@@ -64,8 +64,12 @@ static const struct {
-     { IMGFMT_RGB64LE,    AV_PIX_FMT_RGBA64LE },
-     { IMGFMT_RGB64BE,    AV_PIX_FMT_RGBA64BE },
- #endif /* LIBAVUTIL_VERSION_MICRO >= 100 */
-+
-+#if 0
-     { IMGFMT_XYZ12LE,    AV_PIX_FMT_XYZ12LE },
-     { IMGFMT_XYZ12BE,    AV_PIX_FMT_XYZ12BE },
-+#endif
-+
-     { IMGFMT_422A,       AV_PIX_FMT_YUVA422P },
-     { IMGFMT_444A,       AV_PIX_FMT_YUVA444P },
-     { IMGFMT_GBR24P,     AV_PIX_FMT_GBRP },
Index: x11/mplayer/patches/patch-libao2_ao_sndio_c
===================================================================
RCS file: x11/mplayer/patches/patch-libao2_ao_sndio_c
diff -N x11/mplayer/patches/patch-libao2_ao_sndio_c
--- x11/mplayer/patches/patch-libao2_ao_sndio_c 19 Feb 2014 19:12:43 -0000      
1.3
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,30 +0,0 @@
-$OpenBSD: patch-libao2_ao_sndio_c,v 1.3 2014/02/19 19:12:43 ratchov Exp $
---- libao2/ao_sndio.c.orig     Mon Jan  6 23:02:58 2014
-+++ libao2/ao_sndio.c  Tue Feb 18 14:31:47 2014
-@@ -103,6 +103,8 @@ static int init(int rate, int channels, int format, in
-     }
-     sio_initpar(&par);
-     par.bits = af_fmt2bits(format);
-+    par.bps = (par.bits + 7) >> 3;
-+    par.msb = 1;
-     par.sig = (format & AF_FORMAT_SIGN_MASK) == AF_FORMAT_SI;
-     if (par.bits > 8)
-         par.le = (format & AF_FORMAT_END_MASK) == AF_FORMAT_LE;
-@@ -118,7 +120,7 @@ static int init(int rate, int channels, int format, in
-         mp_msg(MSGT_AO, MSGL_ERR, "ao2: couldn't get params\n");
-         goto err_out;
-     }
--    if (par.bps != SIO_BPS(par.bits)) {
-+    if (par.bits < 8 * par.bps && !par.msb) {
-         mp_msg(MSGT_AO, MSGL_ERR, "ao2: unsupported format\n");
-         goto err_out;
-     }
-@@ -132,6 +134,8 @@ static int init(int rate, int channels, int format, in
-     ao_data.format |= par.sig ? AF_FORMAT_SI : AF_FORMAT_US;
-     if (par.bits > 8)
-         ao_data.format |= par.le ? AF_FORMAT_LE : AF_FORMAT_BE;
-+    else
-+        ao_data.format |= AF_FORMAT_NE;
-     ao_data.channels = par.pchan;
-     ao_data.bps = bpf * par.rate;
-     ao_data.buffersize = par.bufsz * bpf;
Index: x11/mplayer/patches/patch-libmpcodecs_vd_ffmpeg_c
===================================================================
RCS file: x11/mplayer/patches/patch-libmpcodecs_vd_ffmpeg_c
diff -N x11/mplayer/patches/patch-libmpcodecs_vd_ffmpeg_c
--- x11/mplayer/patches/patch-libmpcodecs_vd_ffmpeg_c   10 Jan 2014 21:52:29 
-0000      1.3
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,28 +0,0 @@
-$OpenBSD: patch-libmpcodecs_vd_ffmpeg_c,v 1.3 2014/01/10 21:52:29 brad Exp $
-
-Deal with older FFmpeg.
-
---- libmpcodecs/vd_ffmpeg.c.orig       Mon Jan  6 17:31:30 2014
-+++ libmpcodecs/vd_ffmpeg.c    Mon Jan  6 17:51:42 2014
-@@ -254,8 +254,12 @@ static void set_dr_slice_settings(struct AVCodecContex
- 
-     ctx->do_dr1 = (lavc_codec->capabilities & CODEC_CAP_DR1) &&
-         lavc_codec->id != AV_CODEC_ID_INTERPLAY_VIDEO &&
-+#if 0
-         lavc_codec->id != AV_CODEC_ID_H264 &&
-         lavc_codec->id != AV_CODEC_ID_HEVC;
-+#else
-+        lavc_codec->id != AV_CODEC_ID_H264;
-+#endif
-     ctx->nonref_dr = 0;
-     // TODO: fix and enable again. This currently causes issues when using 
filters
-     // and seeking, usually failing with the "Ran out of numbered images" 
message,
-@@ -940,7 +944,7 @@ static mp_image_t *decode(sh_video_t *sh, void *data, 
-     ret = avcodec_decode_video2(avctx, pic, &got_picture, &pkt);
-     pkt.data = NULL;
-     pkt.size = 0;
--    av_packet_free_side_data(&pkt);
-+    av_destruct_packet(&pkt);
- 
-     // even when we do dr we might actually get a buffer we had
-     // FFmpeg allocate - this mostly happens with nonref_dr.
Index: x11/mplayer/patches/patch-libmpdemux_demux_lavf_c
===================================================================
RCS file: x11/mplayer/patches/patch-libmpdemux_demux_lavf_c
diff -N x11/mplayer/patches/patch-libmpdemux_demux_lavf_c
--- x11/mplayer/patches/patch-libmpdemux_demux_lavf_c   10 Jan 2014 21:52:29 
-0000      1.4
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-$OpenBSD: patch-libmpdemux_demux_lavf_c,v 1.4 2014/01/10 21:52:29 brad Exp $
-
-Deal with older FFmpeg.
-
---- libmpdemux/demux_lavf.c.orig       Mon Jan  6 17:03:23 2014
-+++ libmpdemux/demux_lavf.c    Mon Jan  6 17:22:43 2014
-@@ -442,7 +442,7 @@ static void handle_stream(demuxer_t *demuxer, AVFormat
-             else if (codec->codec_id == AV_CODEC_ID_MOV_TEXT)
-                 type = 'm';
-             else if (codec->codec_id == AV_CODEC_ID_SSA
--#if LIBAVUTIL_VERSION_MICRO >= 100
-+#if 0
-                      || codec->codec_id == AV_CODEC_ID_ASS
- #endif /* LIBAVUTIL_VERSION_MICRO >= 100 */
-                 )
Index: x11/mplayer/patches/patch-libmpdemux_demux_mpg_c
===================================================================
RCS file: x11/mplayer/patches/patch-libmpdemux_demux_mpg_c
diff -N x11/mplayer/patches/patch-libmpdemux_demux_mpg_c
--- x11/mplayer/patches/patch-libmpdemux_demux_mpg_c    16 Feb 2014 19:50:52 
-0000      1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,20 +0,0 @@
-$OpenBSD: patch-libmpdemux_demux_mpg_c,v 1.1 2014/02/16 19:50:52 pascal Exp $
-
-Upstream r36845:
-Fix probe bug losing video packets.
-
-ds_fill_buffer will actually lose any data from previous
-ds_fill_buffer calls.
-Use demux_fill_buffer instead to get the intended behaviour.
-
---- libmpdemux/demux_mpg.c.orig        Mon Jan  6 23:03:23 2014
-+++ libmpdemux/demux_mpg.c     Sun Feb 16 14:35:43 2014
-@@ -192,7 +192,7 @@ static demuxer_t* demux_mpg_open(demuxer_t* demuxer) {
-   mpg_demuxer_t* mpg_d;
- 
-   while (demuxer->video->packs + demuxer->audio->packs < 2)
--    if (!ds_fill_buffer(demuxer->video)) return 0;
-+    if (!demux_fill_buffer(demuxer, demuxer->video)) return 0;
-   mpg_d = calloc(1,sizeof(mpg_demuxer_t));
-   if(mpg_d)
-   {
Index: x11/mplayer/patches/patch-libmpdemux_mp_taglists_c
===================================================================
RCS file: x11/mplayer/patches/patch-libmpdemux_mp_taglists_c
diff -N x11/mplayer/patches/patch-libmpdemux_mp_taglists_c
--- x11/mplayer/patches/patch-libmpdemux_mp_taglists_c  10 Jan 2014 21:52:29 
-0000      1.6
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,34 +0,0 @@
-$OpenBSD: patch-libmpdemux_mp_taglists_c,v 1.6 2014/01/10 21:52:29 brad Exp $
-
-Deal with older FFmpeg.
-
---- libmpdemux/mp_taglists.c.orig      Mon Jan  6 17:03:23 2014
-+++ libmpdemux/mp_taglists.c   Mon Jan  6 17:31:04 2014
-@@ -29,8 +29,8 @@
- static const struct AVCodecTag mp_wav_tags[] = {
-     { AV_CODEC_ID_ADPCM_4XM,         MKTAG('4', 'X', 'M', 'A') },
-     { AV_CODEC_ID_ADPCM_ADX,         MKTAG('S', 'a', 'd', 'x') },
--#if LIBAVUTIL_VERSION_MICRO >= 100
-     { AV_CODEC_ID_ADPCM_AFC,         MKTAG('A', 'F', 'C', ' ') },
-+#if 0
-     { AV_CODEC_ID_ADPCM_DTK,         MKTAG('D', 'T', 'K', ' ') },
- #endif
-     { AV_CODEC_ID_ADPCM_IMA_APC,     MKTAG('A', 'P', 'C', 'A') },
-@@ -109,7 +109,7 @@ static const struct AVCodecTag mp_codecid_override_tag
-     { AV_CODEC_ID_ESCAPE130,         MKTAG('E', '1', '3', '0') },
- #endif
-     { AV_CODEC_ID_FLV1,              MKTAG('F', 'L', 'V', '1') },
--#if LIBAVUTIL_VERSION_MICRO >= 100
-+#if 0
-     { AV_CODEC_ID_ADPCM_G726LE,      MKTAG('6', '2', '7', 'G') },
- #endif
-     { AV_CODEC_ID_G729,              MKTAG('G', '7', '2', '9') },
-@@ -158,7 +158,7 @@ static const struct AVCodecTag mp_bmp_tags[] = {
-     { AV_CODEC_ID_DSICINVIDEO,       MKTAG('D', 'C', 'I', 'V') },
-     { AV_CODEC_ID_DXA,               MKTAG('D', 'X', 'A', '1') },
-     { AV_CODEC_ID_FLIC,              MKTAG('f', 'l', 'i', 'c') },
--#if LIBAVUTIL_VERSION_MICRO >= 100
-+#if 0
-     { AV_CODEC_ID_HEVC,              MKTAG('H', 'E', 'V', 'C') },
- #endif
-     { AV_CODEC_ID_IDCIN,             MKTAG('I', 'D', 'C', 'I') },

-- 
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.

Reply via email to