diff --git a/multimedia/ffmpeg1/Makefile b/multimedia/ffmpeg1/Makefile
index 1fbe0f9..7777c14 100644
--- a/multimedia/ffmpeg1/Makefile
+++ b/multimedia/ffmpeg1/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ffmpeg
-PORTVERSION=	1.0.5
+PORTVERSION=	1.2
 CATEGORIES=	multimedia audio ipv6 net
 MASTER_SITES=	http://ffmpeg.org/releases/
 PKGNAMESUFFIX=	1
diff --git a/multimedia/ffmpeg1/distinfo b/multimedia/ffmpeg1/distinfo
index 0a8f21a..eccea86 100644
--- a/multimedia/ffmpeg1/distinfo
+++ b/multimedia/ffmpeg1/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ffmpeg-1.0.5.tar.bz2) = 1f1af23112e2da8403abce605749db9111d45d2e4e28910831e778c6e2cbdcce
-SIZE (ffmpeg-1.0.5.tar.bz2) = 6449133
+SHA256 (ffmpeg-1.2.tar.bz2) = 9a39fbc07dae0c893059e07491bcfb1e2409cc220f72b41eed23a04becea5aaf
+SIZE (ffmpeg-1.2.tar.bz2) = 5969590
diff --git a/multimedia/ffmpeg1/files/patch-configure b/multimedia/ffmpeg1/files/patch-configure
index 325eb7b..e827011 100644
--- a/multimedia/ffmpeg1/files/patch-configure
+++ b/multimedia/ffmpeg1/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	2013-02-07 01:29:22.000000000 +0100
-+++ configure	2013-02-23 22:38:06.946960545 +0100
-@@ -2030,7 +2030,7 @@
+--- configure.orig
++++ configure
+@@ -2147,7 +2147,7 @@ yasmexe_default="yasm"
  nogas=":"
  
  # machine
@@ -9,9 +9,9 @@
  cpu="generic"
  
  # OS
-@@ -3729,10 +3729,10 @@
- perl --version > /dev/null 2>&1 && enable perl || disable perl
+@@ -3991,10 +3991,10 @@ perl --version > /dev/null 2>&1 && enabl
  pod2man --help > /dev/null 2>&1 && enable pod2man || disable pod2man
+ rsync --help 2> /dev/null | grep -q 'contimeout' && enable rsync_contimeout || disable rsync_contimeout
  
 -check_header linux/fb.h
 -check_header linux/videodev.h
@@ -24,7 +24,7 @@
  
  check_header sys/videoio.h
  
-@@ -4122,7 +4122,7 @@
+@@ -4373,7 +4373,7 @@ ifndef MAIN_MAKEFILE
  SRC_PATH:=\$(SRC_PATH:.%=..%)
  endif
  CC_IDENT=$cc_ident
@@ -33,14 +33,7 @@
  CC=$cc
  CXX=$cxx
  AS=$as
-@@ -4325,13 +4325,13 @@
-     requires=$5
-     enabled ${name#lib} || return 0
-     mkdir -p $name
--    cat <<EOF > $name/$name.pc
-+    cat <<EOF > $name/${name}${build_suffix}.pc
- prefix=$prefix
- exec_prefix=\${prefix}
+@@ -4555,7 +4555,7 @@ exec_prefix=\${prefix}
  libdir=$libdir
  includedir=$incdir
  
@@ -49,7 +42,7 @@
  Description: $comment
  Version: $version
  Requires: $(enabled shared || echo $requires)
-@@ -4345,10 +4345,10 @@
+@@ -4569,10 +4569,10 @@ EOF
  mkdir -p doc/examples/pc-uninstalled
  includedir=${source_path}
  [ "$includedir" = . ] && includedir="\${pcfiledir}/../../.."
@@ -62,41 +55,3 @@
  includedir=${includedir}
  
  Name: $name
-@@ -4362,25 +4362,25 @@
- }
- 
- libavfilter_pc_deps=""
--enabled libavfilter_deps_avcodec    && prepend libavfilter_pc_deps "libavcodec = $LIBAVCODEC_VERSION,"
--enabled libavfilter_deps_avformat   && prepend libavfilter_pc_deps "libavformat = $LIBAVFORMAT_VERSION,"
--enabled libavfilter_deps_swscale    && prepend libavfilter_pc_deps "libswscale = $LIBSWSCALE_VERSION,"
--enabled libavfilter_deps_swresample && prepend libavfilter_pc_deps "libswresample = $LIBSWRESAMPLE_VERSION,"
--enabled libavfilter_deps_postproc   && prepend libavfilter_pc_deps "libpostproc = $LIBPOSTPROC_VERSION,"
-+enabled libavfilter_deps_avcodec    && prepend libavfilter_pc_deps "libavcodec${build_suffix} = $LIBAVCODEC_VERSION,"
-+enabled libavfilter_deps_avformat   && prepend libavfilter_pc_deps "libavformat${build_suffix} = $LIBAVFORMAT_VERSION,"
-+enabled libavfilter_deps_swscale    && prepend libavfilter_pc_deps "libswscale${build_suffix} = $LIBSWSCALE_VERSION,"
-+enabled libavfilter_deps_swresample && prepend libavfilter_pc_deps "libswresample${build_suffix} = $LIBSWRESAMPLE_VERSION,"
-+enabled libavfilter_deps_postproc   && prepend libavfilter_pc_deps "libpostproc${build_suffix} = $LIBPOSTPROC_VERSION,"
- libavfilter_pc_deps=${libavfilter_pc_deps%, }
- 
--libavdevice_pc_deps="libavformat = $LIBAVFORMAT_VERSION"
--enabled lavfi_indev && prepend libavdevice_pc_deps "libavfilter = $LIBAVFILTER_VERSION,"
-+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 = $LIBAVUTIL_VERSION"
--pkgconfig_generate libavformat "FFmpeg container format library" "$LIBAVFORMAT_VERSION" "$extralibs" "libavcodec = $LIBAVCODEC_VERSION"
-+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 video filtering library" "$LIBAVFILTER_VERSION" "$extralibs" "$libavfilter_pc_deps"
--pkgconfig_generate libpostproc "FFmpeg postprocessing library" "$LIBPOSTPROC_VERSION" "" "libavutil = $LIBAVUTIL_VERSION"
-+pkgconfig_generate libpostproc "FFmpeg postprocessing library" "$LIBPOSTPROC_VERSION" "" "libavutil${build_suffix} = $LIBAVUTIL_VERSION"
- pkgconfig_generate libavresample "Libav audio resampling library" "$LIBAVRESAMPLE_VERSION" "$extralibs"
--pkgconfig_generate libswscale "FFmpeg image rescaling library" "$LIBSWSCALE_VERSION" "$LIBM" "libavutil = $LIBAVUTIL_VERSION"
--pkgconfig_generate libswresample "FFmpeg audio rescaling library" "$LIBSWRESAMPLE_VERSION" "$LIBM" "libavutil = $LIBAVUTIL_VERSION"
-+pkgconfig_generate libswscale "FFmpeg image rescaling library" "$LIBSWSCALE_VERSION" "$LIBM" "libavutil${build_suffix} = $LIBAVUTIL_VERSION"
-+pkgconfig_generate libswresample "FFmpeg audio rescaling library" "$LIBSWRESAMPLE_VERSION" "$LIBM" "libavutil${build_suffix} = $LIBAVUTIL_VERSION"
- 
- fix_ffmpeg_remote(){
-     git_remote_from=$1
diff --git a/multimedia/ffmpeg1/files/patch-libavcodec-libgsm.c b/multimedia/ffmpeg1/files/patch-libavcodec-libgsm.c
deleted file mode 100644
index 22b3463..0000000
--- a/multimedia/ffmpeg1/files/patch-libavcodec-libgsm.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- libavcodec/libgsm.c.orig	2012-01-22 14:41:15.000000000 +0100
-+++ libavcodec/libgsm.c	2012-01-22 16:06:24.357156664 +0100
-@@ -27,7 +27,7 @@
- 
- // The idiosyncrasies of GSM-in-WAV are explained at http://kbs.cs.tu-berlin.de/~jutta/toast.html
- 
--#include <gsm/gsm.h>
-+#include <gsm.h>
- 
- #include "avcodec.h"
- #include "gsm.h"
diff --git a/multimedia/ffmpeg1/files/patch-library.mak b/multimedia/ffmpeg1/files/patch-library.mak
index 14e50e5..8a53c24 100644
--- a/multimedia/ffmpeg1/files/patch-library.mak
+++ b/multimedia/ffmpeg1/files/patch-library.mak
@@ -4,10 +4,9 @@
  	$(Q)mkdir -p "$(INCINSTDIR)"
  	$$(INSTALL) -m 644 $$^ "$(INCINSTDIR)"
  
--install-lib$(NAME)-pkgconfig: $(SUBDIR)lib$(NAME).pc
+ install-lib$(NAME)-pkgconfig: $(SUBDIR)lib$(FULLNAME).pc
 -	$(Q)mkdir -p "$(LIBDIR)/pkgconfig"
 -	$$(INSTALL) -m 644 $$^ "$(LIBDIR)/pkgconfig"
-+install-lib$(NAME)-pkgconfig: $(SUBDIR)lib$(NAME)$(BUILDSUF).pc
 +	$(Q)mkdir -p "$(prefix)/libdata/pkgconfig"
 +	$$(INSTALL) -m 644 $$^ "$(prefix)/libdata/pkgconfig"
  
@@ -17,8 +16,8 @@
  
  uninstall-headers::
  	$(RM) $(addprefix "$(INCINSTDIR)/",$(HEADERS) $(BUILT_HEADERS))
--	$(RM) "$(LIBDIR)/pkgconfig/lib$(NAME).pc"
-+	$(RM) "$(prefix)/libdata/pkgconfig/lib$(NAME).pc"
+-	$(RM) "$(LIBDIR)/pkgconfig/lib$(FULLNAME).pc"
++	$(RM) "$(prefix)/libdata/pkgconfig/lib$(FULLNAME).pc"
  	-rmdir "$(INCINSTDIR)"
  endef
  
diff --git a/multimedia/ffmpeg1/pkg-plist b/multimedia/ffmpeg1/pkg-plist
index 023b1b4..bbb4552 100644
--- a/multimedia/ffmpeg1/pkg-plist
+++ b/multimedia/ffmpeg1/pkg-plist
@@ -38,6 +38,7 @@ include/ffmpeg%%SUFF%%/libavutil/base64.h
 include/ffmpeg%%SUFF%%/libavutil/blowfish.h
 include/ffmpeg%%SUFF%%/libavutil/bprint.h
 include/ffmpeg%%SUFF%%/libavutil/bswap.h
+include/ffmpeg%%SUFF%%/libavutil/channel_layout.h
 include/ffmpeg%%SUFF%%/libavutil/common.h
 include/ffmpeg%%SUFF%%/libavutil/cpu.h
 include/ffmpeg%%SUFF%%/libavutil/crc.h
@@ -46,6 +47,7 @@ include/ffmpeg%%SUFF%%/libavutil/error.h
 include/ffmpeg%%SUFF%%/libavutil/eval.h
 include/ffmpeg%%SUFF%%/libavutil/fifo.h
 include/ffmpeg%%SUFF%%/libavutil/file.h
+include/ffmpeg%%SUFF%%/libavutil/hmac.h
 include/ffmpeg%%SUFF%%/libavutil/imgutils.h
 include/ffmpeg%%SUFF%%/libavutil/intfloat.h
 include/ffmpeg%%SUFF%%/libavutil/intfloat_readwrite.h
@@ -56,6 +58,7 @@ include/ffmpeg%%SUFF%%/libavutil/lzo.h
 include/ffmpeg%%SUFF%%/libavutil/mathematics.h
 include/ffmpeg%%SUFF%%/libavutil/md5.h
 include/ffmpeg%%SUFF%%/libavutil/mem.h
+include/ffmpeg%%SUFF%%/libavutil/old_pix_fmts.h
 include/ffmpeg%%SUFF%%/libavutil/opt.h
 include/ffmpeg%%SUFF%%/libavutil/parseutils.h
 include/ffmpeg%%SUFF%%/libavutil/pixdesc.h
@@ -70,41 +73,43 @@ include/ffmpeg%%SUFF%%/libavutil/timestamp.h
 include/ffmpeg%%SUFF%%/libavutil/version.h
 include/ffmpeg%%SUFF%%/libavutil/xtea.h
 include/ffmpeg%%SUFF%%/libpostproc/postprocess.h
+include/ffmpeg%%SUFF%%/libpostproc/version.h
 include/ffmpeg%%SUFF%%/libswresample/swresample.h
+include/ffmpeg%%SUFF%%/libswresample/version.h
 include/ffmpeg%%SUFF%%/libswscale/swscale.h
 include/ffmpeg%%SUFF%%/libswscale/version.h
 lib/ffmpeg%%SUFF%%/libavcodec%%SUFF%%.a
 lib/ffmpeg%%SUFF%%/libavcodec%%SUFF%%.so
 lib/ffmpeg%%SUFF%%/libavcodec%%SUFF%%.so.54
-lib/ffmpeg%%SUFF%%/libavcodec%%SUFF%%.so.54.59.100
+lib/ffmpeg%%SUFF%%/libavcodec%%SUFF%%.so.54.92.100
 lib/ffmpeg%%SUFF%%/libavdevice%%SUFF%%.a
 lib/ffmpeg%%SUFF%%/libavdevice%%SUFF%%.so
 lib/ffmpeg%%SUFF%%/libavdevice%%SUFF%%.so.54
-lib/ffmpeg%%SUFF%%/libavdevice%%SUFF%%.so.54.2.101
+lib/ffmpeg%%SUFF%%/libavdevice%%SUFF%%.so.54.3.103
 lib/ffmpeg%%SUFF%%/libavfilter%%SUFF%%.a
 lib/ffmpeg%%SUFF%%/libavfilter%%SUFF%%.so
 lib/ffmpeg%%SUFF%%/libavfilter%%SUFF%%.so.3
-lib/ffmpeg%%SUFF%%/libavfilter%%SUFF%%.so.3.17.100
+lib/ffmpeg%%SUFF%%/libavfilter%%SUFF%%.so.3.42.103
 lib/ffmpeg%%SUFF%%/libavformat%%SUFF%%.a
 lib/ffmpeg%%SUFF%%/libavformat%%SUFF%%.so
 lib/ffmpeg%%SUFF%%/libavformat%%SUFF%%.so.54
-lib/ffmpeg%%SUFF%%/libavformat%%SUFF%%.so.54.29.104
+lib/ffmpeg%%SUFF%%/libavformat%%SUFF%%.so.54.63.104
 lib/ffmpeg%%SUFF%%/libavutil%%SUFF%%.a
 lib/ffmpeg%%SUFF%%/libavutil%%SUFF%%.so
-lib/ffmpeg%%SUFF%%/libavutil%%SUFF%%.so.51
-lib/ffmpeg%%SUFF%%/libavutil%%SUFF%%.so.51.73.101
+lib/ffmpeg%%SUFF%%/libavutil%%SUFF%%.so.52
+lib/ffmpeg%%SUFF%%/libavutil%%SUFF%%.so.52.18.100
 lib/ffmpeg%%SUFF%%/libpostproc%%SUFF%%.a
 lib/ffmpeg%%SUFF%%/libpostproc%%SUFF%%.so
 lib/ffmpeg%%SUFF%%/libpostproc%%SUFF%%.so.52
-lib/ffmpeg%%SUFF%%/libpostproc%%SUFF%%.so.52.0.100
+lib/ffmpeg%%SUFF%%/libpostproc%%SUFF%%.so.52.2.100
 lib/ffmpeg%%SUFF%%/libswresample%%SUFF%%.a
 lib/ffmpeg%%SUFF%%/libswresample%%SUFF%%.so
 lib/ffmpeg%%SUFF%%/libswresample%%SUFF%%.so.0
-lib/ffmpeg%%SUFF%%/libswresample%%SUFF%%.so.0.15.100
+lib/ffmpeg%%SUFF%%/libswresample%%SUFF%%.so.0.17.102
 lib/ffmpeg%%SUFF%%/libswscale%%SUFF%%.a
 lib/ffmpeg%%SUFF%%/libswscale%%SUFF%%.so
 lib/ffmpeg%%SUFF%%/libswscale%%SUFF%%.so.2
-lib/ffmpeg%%SUFF%%/libswscale%%SUFF%%.so.2.1.101
+lib/ffmpeg%%SUFF%%/libswscale%%SUFF%%.so.2.2.100
 libdata/pkgconfig/libavcodec%%SUFF%%.pc
 libdata/pkgconfig/libavdevice%%SUFF%%.pc
 libdata/pkgconfig/libavfilter%%SUFF%%.pc
@@ -114,12 +119,14 @@ libdata/pkgconfig/libpostproc%%SUFF%%.pc
 libdata/pkgconfig/libswresample%%SUFF%%.pc
 libdata/pkgconfig/libswscale%%SUFF%%.pc
 %%DATADIR%%/examples/Makefile
+%%DATADIR%%/examples/README
 %%DATADIR%%/examples/decoding_encoding.c
 %%DATADIR%%/examples/demuxing.c
 %%DATADIR%%/examples/filtering_audio.c
 %%DATADIR%%/examples/filtering_video.c
 %%DATADIR%%/examples/metadata.c
 %%DATADIR%%/examples/muxing.c
+%%DATADIR%%/examples/resampling_audio.c
 %%DATADIR%%/examples/scaling_video.c
 %%DATADIR%%/ffprobe.xsd
 %%DATADIR%%/libvpx-1080p.ffpreset