Changes 1.0:

- INI and flat output in ffprobe
- Scene detection in libavfilter
- Indeo Audio decoder
- channelsplit audio filter
- setnsamples audio filter
- atempo filter
- ffprobe -show_data option
- RTMPT protocol support
- iLBC encoding/decoding via libilbc
- Microsoft Screen 1 decoder
- join audio filter
- audio channel mapping filter
- Microsoft ATC Screen decoder
- RTSP listen mode
- TechSmith Screen Codec 2 decoder
- AAC encoding via libfdk-aac
- Microsoft Expression Encoder Screen decoder
- RTMPS protocol support
- RTMPTS protocol support
- RTMPE protocol support
- RTMPTE protocol support
- showwaves and showspectrum filter
- LucasArts SMUSH playback support
- SAMI, RealText and SubViewer demuxers and decoders
- Heart Of Darkness PAF playback support
- iec61883 device
- asettb filter
- new option: -progress
- 3GPP Timed Text encoder/decoder
- GeoTIFF decoder support
- ffmpeg -(no)stdin option
- Opus decoder using libopus
- caca output device using libcaca
- alphaextract and alphamerge filters
- concat filter
- flite filter
- Canopus Lossless Codec decoder
- bitmap subtitles in filters (experimental and temporary)
- MP2 encoding via TwoLAME
- bmp parser
- smptebars source
- asetpts filter
- hue filter
- ICO muxer
- SubRip encoder and decoder without embedded timing
- edge detection filter
- framestep filter
- ffmpeg -shortest option is now per-output file
  -pass and -passlogfile are now per-output stream
- volume measurement filter
- Ut Video encoder
- Microsoft Screen 2 decoder
- Matroska demuxer now identifies SRT subtitles as AV_CODEC_ID_SUBRIP
  instead of AV_CODEC_ID_TEXT
- smartblur filter ported from MPlayer
- CPiA decoder
- decimate filter ported from MPlayer
- RTP depacketization of JPEG
- Smooth Streaming live segmenter muxer
- F4V muxer
- sendcmd and asendcmd filters
- WebVTT demuxer and decoder (simple tags supported)
- RTP packetization of JPEG
- faststart option in the MOV/MP4 muxer

8 files changed, 108 insertions, 114 deletions

diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index a58069acd58..74af87fd22f 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.91 2012/11/05 12:53:07 drochner Exp $
+# $NetBSD: Makefile,v 1.92 2012/11/08 19:57:29 adam Exp $
 
-PKGNAME=	ffmpeg-20121026.${DISTVERSION}
+PKGNAME=	ffmpeg-20121028.${DISTVERSION}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://ffmpeg.mplayerhq.hu/
@@ -17,10 +17,6 @@ CONF_FILES+=	${PREFIX}/share/examples/ffmpeg/ffserver.conf \
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS} == "Darwin"
-CONFIGURE_ARGS+=	--disable-asm
-.endif
-
 # "error: can't find a register in class 'GENERAL_REGS' while reloading 'asm'"
 CFLAGS.SunOS+=	-DBROKEN_RELOCATIONS=1
 
diff --git a/multimedia/ffmpeg/Makefile.common b/multimedia/ffmpeg/Makefile.common
index ea93c7cc93d..d3f2dccc8e4 100644
--- a/multimedia/ffmpeg/Makefile.common
+++ b/multimedia/ffmpeg/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.23 2012/11/05 12:53:08 drochner Exp $
+# $NetBSD: Makefile.common,v 1.24 2012/11/08 19:57:29 adam Exp $
 # used by multimedia/ffplay/Makefile
 # used by multimedia/ffmpeg/Makefile
 
@@ -7,14 +7,45 @@ CATEGORIES=	multimedia
 MASTER_SITES=	http://www.ffmpeg.org/releases/
 EXTRACT_SUFX=	.tar.bz2
 
-DISTVERSION=	0.10.6
+LICENSE=	gnu-lgpl-v2.1 AND gnu-gpl-v2
+
+DISTVERSION=	1.0
 PREV_PKGPATH=	multimedia/ffmpeg-devel
 PATCHDIR=	${.CURDIR}/../../multimedia/ffmpeg/patches
 
-HAS_CONFIGURE=	YES
-USE_LANGUAGES+=	c99
-USE_LIBTOOL=	YES
-USE_TOOLS+=	gmake texi2html pod2man
+USE_LANGUAGES=		c99
+USE_LIBTOOL=		yes
+USE_TOOLS+=		gmake texi2html pod2man
+HAS_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--mandir=${PREFIX}/${PKGMANDIR}
+CONFIGURE_ARGS+=	--cc=${CC:Q}
+CONFIGURE_ARGS+=	--prefix=${PREFIX}
+CONFIGURE_ARGS+=	--disable-debug
+CONFIGURE_ARGS+=	--disable-optimizations
+CONFIGURE_ARGS+=	--disable-stripping
+CONFIGURE_ARGS+=	--enable-shared
+CONFIGURE_ARGS+=	--enable-pthreads
+CONFIGURE_ARGS+=	--enable-gpl
+
+.if ${OPSYS} == "SunOS"
+CONFIGURE_ARGS+=	--disable-amd3dnow
+CONFIGURE_ARGS+=	--disable-amd3dnowext
+CONFIGURE_ARGS+=	--disable-mmx
+CONFIGURE_ARGS+=	--disable-mmx2
+CONFIGURE_ARGS+=	--disable-sse
+CONFIGURE_ARGS+=	--disable-ssse3
+.else
+CONFIGURE_ARGS+=	--enable-runtime-cpudetect
+.endif
+
+# No posix_memalign() in NetBSD 4.0 and earlier
+.if !empty(MACHINE_PLATFORM:MNetBSD-[1-4].*-*)
+CONFIGURE_ARGS+=	--enable-memalign-hack
+.endif
+
+# Let's not put garbage into /tmp
+CONFIGURE_ENV+=		TMPDIR=${WRKSRC}/tmp
+
 
 .include "../../mk/compiler.mk"
 
@@ -45,36 +76,6 @@ PLIST_SRC+=	${PKGDIR}/PLIST
 MAKE_ENV+=	EXTRA_LIBS=${LIBGETOPT:Q}
 # LOCALBASE=${LOCALBASE:Q}
 
-# Let's not put garbage into /tmp
-CONFIGURE_ENV+=		TMPDIR=${WRKSRC}/tmp
-
-CONFIGURE_ARGS+=	--mandir=${PREFIX}/${PKGMANDIR}
-CONFIGURE_ARGS+=	--cc=${CC:Q}
-CONFIGURE_ARGS+=	--prefix=${PREFIX}
-CONFIGURE_ARGS+=	--disable-debug
-CONFIGURE_ARGS+=	--disable-optimizations
-CONFIGURE_ARGS+=	--disable-stripping
-CONFIGURE_ARGS+=	--enable-shared
-CONFIGURE_ARGS+=	--enable-pthreads
-CONFIGURE_ARGS+=	--enable-gpl
-
-.if ${OPSYS} == "SunOS"
-CONFIGURE_ARGS+=	--disable-amd3dnow
-CONFIGURE_ARGS+=	--disable-amd3dnowext
-CONFIGURE_ARGS+=	--disable-mmx
-CONFIGURE_ARGS+=	--disable-mmx2
-CONFIGURE_ARGS+=	--disable-sse
-CONFIGURE_ARGS+=	--disable-ssse3
-.else
-CONFIGURE_ARGS+=	--enable-runtime-cpudetect
-.endif
-
-# No posix_memalign() in NetBSD 4.0 and earlier
-#
-.if !empty(MACHINE_PLATFORM:MNetBSD-[1-4].*-*)
-CONFIGURE_ARGS+=	--enable-memalign-hack
-.endif
-
 pre-configure:
 	mkdir ${WRKSRC}/tmp
 
diff --git a/multimedia/ffmpeg/PLIST b/multimedia/ffmpeg/PLIST
index 0f9b147c52c..b445fed1ff9 100644
--- a/multimedia/ffmpeg/PLIST
+++ b/multimedia/ffmpeg/PLIST
@@ -1,35 +1,40 @@
-@comment $NetBSD: PLIST,v 1.18 2012/10/10 13:33:44 drochner Exp $
+@comment $NetBSD: PLIST,v 1.19 2012/11/08 19:57:29 adam Exp $
 bin/ffmpeg
 bin/ffprobe
 bin/ffserver
 include/libavcodec/avcodec.h
 include/libavcodec/avfft.h
 include/libavcodec/dxva2.h
-include/libavcodec/opt.h
+include/libavcodec/old_codec_ids.h
 include/libavcodec/vaapi.h
 include/libavcodec/vda.h
 include/libavcodec/vdpau.h
 include/libavcodec/version.h
 include/libavcodec/xvmc.h
 include/libavdevice/avdevice.h
+include/libavdevice/version.h
+include/libavfilter/asrc_abuffer.h
 include/libavfilter/avcodec.h
 include/libavfilter/avfilter.h
 include/libavfilter/avfiltergraph.h
 include/libavfilter/buffersink.h
+include/libavfilter/buffersrc.h
 include/libavfilter/version.h
-include/libavfilter/vsrc_buffer.h
 include/libavformat/avformat.h
 include/libavformat/avio.h
 include/libavformat/version.h
 include/libavutil/adler32.h
 include/libavutil/aes.h
 include/libavutil/attributes.h
+include/libavutil/audio_fifo.h
 include/libavutil/audioconvert.h
 include/libavutil/avassert.h
 include/libavutil/avconfig.h
 include/libavutil/avstring.h
 include/libavutil/avutil.h
 include/libavutil/base64.h
+include/libavutil/blowfish.h
+include/libavutil/bprint.h
 include/libavutil/bswap.h
 include/libavutil/common.h
 include/libavutil/cpu.h
@@ -57,29 +62,35 @@ include/libavutil/random_seed.h
 include/libavutil/rational.h
 include/libavutil/samplefmt.h
 include/libavutil/sha.h
+include/libavutil/time.h
+include/libavutil/timecode.h
+include/libavutil/timestamp.h
+include/libavutil/version.h
+include/libavutil/xtea.h
 include/libpostproc/postprocess.h
 include/libswresample/swresample.h
 include/libswscale/swscale.h
+include/libswscale/version.h
 lib/libavcodec.a
 lib/libavcodec.so
-lib/libavcodec.so.53
-lib/libavcodec.so.53.61.100
+lib/libavcodec.so.54
+lib/libavcodec.so.54.59.100
 lib/libavdevice.a
 lib/libavdevice.so
-lib/libavdevice.so.53
-lib/libavdevice.so.53.4.100
+lib/libavdevice.so.54
+lib/libavdevice.so.54.2.101
 lib/libavfilter.a
 lib/libavfilter.so
-lib/libavfilter.so.2
-lib/libavfilter.so.2.61.100
+lib/libavfilter.so.3
+lib/libavfilter.so.3.17.100
 lib/libavformat.a
 lib/libavformat.so
-lib/libavformat.so.53
-lib/libavformat.so.53.32.100
+lib/libavformat.so.54
+lib/libavformat.so.54.29.104
 lib/libavutil.a
 lib/libavutil.so
 lib/libavutil.so.51
-lib/libavutil.so.51.35.100
+lib/libavutil.so.51.73.101
 lib/libpostproc.a
 lib/libpostproc.so
 lib/libpostproc.so.52
@@ -87,11 +98,11 @@ lib/libpostproc.so.52.0.100
 lib/libswresample.a
 lib/libswresample.so
 lib/libswresample.so.0
-lib/libswresample.so.0.6.100
+lib/libswresample.so.0.15.100
 lib/libswscale.a
 lib/libswscale.so
 lib/libswscale.so.2
-lib/libswscale.so.2.1.100
+lib/libswscale.so.2.1.101
 lib/pkgconfig/libavcodec.pc
 lib/pkgconfig/libavdevice.pc
 lib/pkgconfig/libavfilter.pc
@@ -100,15 +111,14 @@ lib/pkgconfig/libavutil.pc
 lib/pkgconfig/libpostproc.pc
 lib/pkgconfig/libswresample.pc
 lib/pkgconfig/libswscale.pc
-man/man1/ffmpeg.1
-man/man1/ffprobe.1
-man/man1/ffserver.1
 share/doc/ffmpeg/avutil.txt
 share/doc/ffmpeg/build_system.txt
 share/doc/ffmpeg/errno.txt
 share/doc/ffmpeg/ffmpeg.txt
+share/doc/ffmpeg/filter_design.txt
 share/doc/ffmpeg/git-howto.txt
 share/doc/ffmpeg/issue_tracker.txt
+share/doc/ffmpeg/mips.txt
 share/doc/ffmpeg/multithreading.txt
 share/doc/ffmpeg/optimization.txt
 share/doc/ffmpeg/rate_distortion.txt
@@ -119,6 +129,14 @@ share/doc/ffmpeg/swscale.txt
 share/doc/ffmpeg/tablegen.txt
 share/doc/ffmpeg/viterbi.txt
 share/examples/ffmpeg/ffserver.conf
+share/ffmpeg/examples/Makefile
+share/ffmpeg/examples/decoding_encoding.c
+share/ffmpeg/examples/demuxing.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/scaling_video.c
 share/ffmpeg/ffprobe.xsd
 share/ffmpeg/libvpx-1080p.ffpreset
 share/ffmpeg/libvpx-1080p50_60.ffpreset
diff --git a/multimedia/ffmpeg/distinfo b/multimedia/ffmpeg/distinfo
index c695705ba89..ecad59e9a18 100644
--- a/multimedia/ffmpeg/distinfo
+++ b/multimedia/ffmpeg/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.59 2012/11/07 15:36:56 joerg Exp $
+$NetBSD: distinfo,v 1.60 2012/11/08 19:57:29 adam Exp $
 
-SHA1 (ffmpeg-0.10.6.tar.bz2) = 6864d54cb6d5da4fd06a170ef97bd19c7677f8d1
-RMD160 (ffmpeg-0.10.6.tar.bz2) = a9eaa71cc6bc0da2508a05afc23595b836d443ff
-Size (ffmpeg-0.10.6.tar.bz2) = 5778721 bytes
-SHA1 (patch-aa) = c9540d0ca0a671e9faa8b5b7847c103b515ac382
-SHA1 (patch-ac) = 14b39a2663be41395be0faae8270e18e2ba0891f
+SHA1 (ffmpeg-1.0.tar.bz2) = bf1f917c4fa26cf225616f2063e60c33cac546be
+RMD160 (ffmpeg-1.0.tar.bz2) = ebb115127f40981ea1887f99b18ae6c70aef5830
+Size (ffmpeg-1.0.tar.bz2) = 6443851 bytes
+SHA1 (patch-aa) = 43f68708e26723ec2e523578090d13bc79014066
+SHA1 (patch-ac) = 1c1c4f086328216f5d0cd9339171efa22065259a
 SHA1 (patch-ap) = 0ea32afb145b55f0186fb14b1b07568d7442ddf3
-SHA1 (patch-configure) = edc359ba50cdc90ad3ce7529f72e07970b679303
-SHA1 (patch-ffserver.c) = 82501fbedc6cd0e829e5524623b2697716a61df8
+SHA1 (patch-configure) = 7b89801bffb8d5e41c1c7f6bb5c69ed0cd1c1de4
diff --git a/multimedia/ffmpeg/patches/patch-aa b/multimedia/ffmpeg/patches/patch-aa
index 11e4baf3ed0..398df754bd0 100644
--- a/multimedia/ffmpeg/patches/patch-aa
+++ b/multimedia/ffmpeg/patches/patch-aa
@@ -1,20 +1,20 @@
-$NetBSD: patch-aa,v 1.11 2012/10/10 13:33:44 drochner Exp $
+$NetBSD: patch-aa,v 1.12 2012/11/08 19:57:29 adam Exp $
 
---- libavutil/x86/cpu.c.orig	2011-07-07 20:46:02.000000000 +0000
+--- libavutil/x86/cpu.c.orig	2012-09-28 01:37:35.000000000 +0000
 +++ libavutil/x86/cpu.c
-@@ -86,6 +86,7 @@ int ff_get_cpu_flags_x86(void)
-             rval |= AV_CPU_FLAG_MMX2
+@@ -126,6 +126,7 @@ int ff_get_cpu_flags_x86(void)
  #if HAVE_SSE
-                   | AV_CPU_FLAG_SSE;
+         if (std_caps & (1 << 25))
+             rval |= AV_CPU_FLAG_SSE;
 +#if !defined(__GNUC__) || (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))
-         if (std_caps & (1<<26))
+         if (std_caps & (1 << 26))
              rval |= AV_CPU_FLAG_SSE2;
          if (ecx & 1)
-@@ -105,6 +106,7 @@ int ff_get_cpu_flags_x86(void)
+@@ -145,6 +146,7 @@ int ff_get_cpu_flags_x86(void)
                  rval |= AV_CPU_FLAG_AVX;
          }
- #endif
+ #endif /* HAVE_AVX */
 +#endif /* gcc >= 4.2 */
- #endif
-                   ;
+ #endif /* HAVE_SSE */
      }
+ 
diff --git a/multimedia/ffmpeg/patches/patch-ac b/multimedia/ffmpeg/patches/patch-ac
index b436bb0b815..97ce5111796 100644
--- a/multimedia/ffmpeg/patches/patch-ac
+++ b/multimedia/ffmpeg/patches/patch-ac
@@ -1,13 +1,15 @@
-$NetBSD: patch-ac,v 1.12 2012/10/10 13:33:44 drochner Exp $
+$NetBSD: patch-ac,v 1.13 2012/11/08 19:57:29 adam Exp $
 
---- Makefile.orig	2012-06-09 20:09:44.000000000 +0000
+--- Makefile.orig	2012-09-28 01:37:35.000000000 +0000
 +++ Makefile
-@@ -124,7 +124,7 @@ install-progs: install-progs-yes $(PROGS
+@@ -138,8 +138,8 @@ install-progs: install-progs-yes $(PROGS
  
- install-data: $(DATA_FILES)
- 	$(Q)mkdir -p "$(DATADIR)"
+ install-data: $(DATA_FILES) $(EXAMPLES_FILES)
+ 	$(Q)mkdir -p "$(DATADIR)/examples"
 -	$(INSTALL) -m 644 $(DATA_FILES) "$(DATADIR)"
+-	$(INSTALL) -m 644 $(EXAMPLES_FILES) "$(DATADIR)/examples"
 +	$(INSTALL) -c -m 644 $(DATA_FILES) "$(DATADIR)"
++	$(INSTALL) -c -m 644 $(EXAMPLES_FILES) "$(DATADIR)/examples"
  
  uninstall: uninstall-libs uninstall-headers uninstall-progs uninstall-data
  
diff --git a/multimedia/ffmpeg/patches/patch-configure b/multimedia/ffmpeg/patches/patch-configure
index 8c1a43c9bbf..693ac63f6f1 100644
--- a/multimedia/ffmpeg/patches/patch-configure
+++ b/multimedia/ffmpeg/patches/patch-configure
@@ -1,8 +1,8 @@
-$NetBSD: patch-configure,v 1.16 2012/10/10 13:33:44 drochner Exp $
+$NetBSD: patch-configure,v 1.17 2012/11/08 19:57:29 adam Exp $
 
---- configure.orig	2012-06-09 20:09:44.000000000 +0000
+--- configure.orig	2012-09-28 01:37:35.000000000 +0000
 +++ configure
-@@ -2604,6 +2604,11 @@ case $target_os in
+@@ -3019,6 +3019,11 @@ case $target_os in
          ;;
      netbsd)
          disable symver
@@ -13,8 +13,8 @@ $NetBSD: patch-configure,v 1.16 2012/10/10 13:33:44 drochner Exp $
 +        test "${subarch}" != "x86_32" && enable pic
          oss_indev_extralibs="-lossaudio"
          oss_outdev_extralibs="-lossaudio"
-         ;;
-@@ -2835,10 +2840,13 @@ check_cc <<EOF && enable attribute_may_a
+         enabled gcc || check_ldflags -Wl,-zmuldefs
+@@ -3300,10 +3305,13 @@ check_cc <<EOF && enable attribute_may_a
  union { int x; } __attribute__((may_alias)) x;
  EOF
  
@@ -31,24 +31,15 @@ $NetBSD: patch-configure,v 1.16 2012/10/10 13:33:44 drochner Exp $
  
  if enabled alpha; then
  
-@@ -3195,7 +3203,7 @@ else
- fi
- enabled sdl && add_cflags $sdl_cflags && add_extralibs $sdl_libs
- 
--texi2html -version > /dev/null 2>&1 && enable texi2html || disable texi2html
-+which texi2html > /dev/null 2>&1 && enable texi2html || disable texi2html
- makeinfo --version > /dev/null 2>&1 && enable makeinfo  || disable makeinfo
- 
- check_header linux/fb.h
-@@ -3291,6 +3299,7 @@ check_ldflags -Wl,--warn-common
- check_ldflags -Wl,-rpath-link=libpostproc:libswresample:libswscale:libavfilter:libavdevice:libavformat:libavcodec:libavutil
- test_ldflags -Wl,-Bsymbolic && append SHFLAGS -Wl,-Bsymbolic
+@@ -3827,6 +3835,7 @@ enabled xmm_clobber_test &&
+                   -Wl,--wrap,sws_scale ||
+     disable xmm_clobber_test
  
 +if false; then
  echo "X{};" > $TMPV
  if test_ldflags -Wl,--version-script,$TMPV; then
      append SHFLAGS '-Wl,--version-script,\$(SUBDIR)lib\$(NAME).ver'
-@@ -3303,6 +3312,7 @@ __asm__(".symver ff_foo,av_foo@VERSION")
+@@ -3839,6 +3848,7 @@ __asm__(".symver ff_foo,av_foo@VERSION")
  void ff_foo(void) {}
  EOF
  fi
@@ -56,7 +47,7 @@ $NetBSD: patch-configure,v 1.16 2012/10/10 13:33:44 drochner Exp $
  
  if [ -n "$optflags" ]; then
      add_cflags $optflags
-@@ -3726,7 +3736,7 @@ Version: $version
+@@ -4336,7 +4346,7 @@ Version: $version
  Requires: $(enabled shared || echo $requires)
  Requires.private: $(enabled shared && echo $requires)
  Conflicts:
diff --git a/multimedia/ffmpeg/patches/patch-ffserver.c b/multimedia/ffmpeg/patches/patch-ffserver.c
deleted file mode 100644
index 8260ffa15f2..00000000000
--- a/multimedia/ffmpeg/patches/patch-ffserver.c
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ffserver.c,v 1.1 2012/11/07 15:36:56 joerg Exp $
-
---- ffserver.c.orig	2012-11-06 23:43:44.000000000 +0000
-+++ ffserver.c
-@@ -3806,7 +3806,7 @@ static void add_codec(FFStream *stream, 
-     AVStream *st;
- 
-     if(stream->nb_streams >= FF_ARRAY_ELEMS(stream->streams))
--        return NULL;
-+        return;
- 
-     /* compute default parameters */
-     switch(av->codec_type) {