aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--multimedia/ffmpeg/Makefile12
-rw-r--r--multimedia/ffmpeg/distinfo4
-rw-r--r--multimedia/ffmpeg/files/patch-libavutil-avutil.h12
3 files changed, 4 insertions, 24 deletions
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index 589d0274d680..1f3f75c6cb4c 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -6,8 +6,7 @@
# $Id: Makefile 77 2008-07-27 21:50:37Z buhnux $
PORTNAME= ffmpeg
-PORTVERSION= 0.7.1
-PORTREVISION= 4
+PORTVERSION= 0.7.2
PORTEPOCH= 1
CATEGORIES= multimedia audio ipv6 net
MASTER_SITES= http://ffmpeg.org/releases/
@@ -107,12 +106,7 @@ USE_LDCONFIG= yes
DOC_FILES= CREDITS INSTALL LICENSE MAINTAINERS README RELEASE
# under doc subdirectory
-DOC_DOCFILES= APIchanges TODO avutil.txt build_system.txt \
- developer.html faq.html fate.txt ffmpeg-mt-authorship.txt \
- ffmpeg.html ffprobe.html general.html \
- git-howto.txt issue_tracker.txt libavfilter.html \
- multithreading.txt optimization.txt rate_distortion.txt \
- snow.txt soc.txt swscale.txt tablegen.txt viterbi.txt
+DOC_DOCFILES= APIchanges RELEASE_NOTES TODO *.txt *.html
PORTDOCS= *
.if !defined(WITH_DEBUG)
@@ -149,7 +143,6 @@ BUILD_DEPENDS+= texi2html:${PORTSDIR}/textproc/texi2html
MAN1+= ffmpeg.1 ffprobe.1
. if !defined(WITHOUT_FFSERVER)
MAN1+= ffserver.1
-DOC_DOCFILES+= ffserver.html
. endif
.endif
@@ -287,7 +280,6 @@ USE_SDL+= sdl
PLIST_FILES+= bin/ffplay
.if !defined(NOPORTDOCS)
MAN1+= ffplay.1
-DOC_DOCFILES+= ffplay.html
.endif
.else
CONFIGURE_ARGS+= --disable-ffplay
diff --git a/multimedia/ffmpeg/distinfo b/multimedia/ffmpeg/distinfo
index 6baab3f559c6..482854911342 100644
--- a/multimedia/ffmpeg/distinfo
+++ b/multimedia/ffmpeg/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ffmpeg-0.7.1.tar.bz2) = 243a770661b52cfa57bd59ab20b417f13bf8d076887f3c32bce533cbf92dea03
-SIZE (ffmpeg-0.7.1.tar.bz2) = 4555714
+SHA256 (ffmpeg-0.7.2.tar.bz2) = 657a1699f6bc4bf37f0c6bcd6068df95a709014e149b08c5bae228881e1aa8f0
+SIZE (ffmpeg-0.7.2.tar.bz2) = 4520731
diff --git a/multimedia/ffmpeg/files/patch-libavutil-avutil.h b/multimedia/ffmpeg/files/patch-libavutil-avutil.h
deleted file mode 100644
index 238795799c47..000000000000
--- a/multimedia/ffmpeg/files/patch-libavutil-avutil.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- libavutil/avutil.h.orig 2011-06-28 00:24:47.927592990 +0200
-+++ libavutil/avutil.h 2011-06-28 00:26:11.892760214 +0200
-@@ -112,7 +112,8 @@
- #define FF_API_OLD_IMAGE_NAMES (LIBAVUTIL_VERSION_MAJOR < 51)
- #endif
- enum AVPictureType {
-- AV_PICTURE_TYPE_I = 1, ///< Intra
-+ AV_PICTURE_TYPE_NONE = 0, ///< Undefined
-+ AV_PICTURE_TYPE_I, ///< Intra
- AV_PICTURE_TYPE_P, ///< Predicted
- AV_PICTURE_TYPE_B, ///< Bi-dir predicted
- AV_PICTURE_TYPE_S, ///< S(GMC)-VOP MPEG4