diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index dbd367adc4..9a93fd5ed5 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -44,6 +44,16 @@
-->
+
+ April 12th, 2015
+
+
+ [fernando] - Update to ffmpeg-2.6.2. Fixes
+ #6389.
+
+
+
+
April 11th, 2015
diff --git a/multimedia/videoutils/ffmpeg.xml b/multimedia/videoutils/ffmpeg.xml
index 39c89d3005..6fd06410c4 100644
--- a/multimedia/videoutils/ffmpeg.xml
+++ b/multimedia/videoutils/ffmpeg.xml
@@ -6,10 +6,12 @@
-
-
-
-
+
+
+
+
]>
@@ -134,7 +136,8 @@
OpenCore AMR,
OpenCV,
librtmp,
- Schroedinger,
+
+ Schroedinger,
(or ) for PDF and PS documentation,
TwoLAME,
vo-aaenc,
@@ -166,6 +169,7 @@
sed -i 's/-lflite"/-lflite -lasound"/' configure &&
+
./configure --prefix=/usr \
--enable-gpl \
--enable-version3 \
@@ -184,7 +188,9 @@
--enable-libx264 \
--enable-x11grab \
--docdir=/usr/share/doc/ffmpeg-&ffmpeg-version; &&
+
make &&
+
gcc tools/qt-faststart.c -o tools/qt-faststart
@@ -203,10 +209,11 @@ for DOCNAME in `basename -s .html *.html`
do
texi2pdf -b $DOCNAME.texi &&
texi2dvi -b $DOCNAME.texi &&
- dvips -o $DOCNAME.ps \
+
+ dvips -o $DOCNAME.ps \
$DOCNAME.dvi
-done &&
-popd &&
+done &&
+popd &&
unset DOCNAME
@@ -226,6 +233,7 @@ unset DOCNAME
make install &&
+
install -v -m755 tools/qt-faststart /usr/bin &&
install -v -m644 doc/*.txt \
/usr/share/doc/ffmpeg-&ffmpeg-version;
@@ -247,16 +255,16 @@ install -v -m644 doc/*.ps \
as the root user:
-install -v -m755 -d /usr/share/doc/ffmpeg-&ffmpeg-version;/api &&
-cp -vr doc/doxy/html/* /usr/share/doc/ffmpeg-&ffmpeg-version;/api &&
-find /usr/share/doc/ffmpeg-&ffmpeg-version;/api -type f -exec chmod -c 0644 "{}" ";" &&
-find /usr/share/doc/ffmpeg-&ffmpeg-version;/api -type d -exec chmod -c 0755 "{}" ";"
+install -v -m755 -d /usr/share/doc/ffmpeg-&ffmpeg-version;/api &&
+cp -vr doc/doxy/html/* /usr/share/doc/ffmpeg-&ffmpeg-version;/api &&
+find /usr/share/doc/ffmpeg-&ffmpeg-version;/api -type f -exec chmod -c 0644 \{} \; &&
+find /usr/share/doc/ffmpeg-&ffmpeg-version;/api -type d -exec chmod -c 0755 \{} \;
To properly test the installation you must have
installed and follow the instructions for the FFmpeg Automated Testing
- Environment (FATE). First, about 882 MB of sample files used to
+ Environment (FATE). First, about 921 MB of sample files used to
run FATE are downloaded with the command:
@@ -273,8 +281,8 @@ find /usr/share/doc/ffmpeg-&ffmpeg-version;/api -type d -exec chmod -c 0755 "{}"
download size and time are drastically reduced. Estimated values in
"Package Information" do not include the download SBU. Some samples may
have been removed, in the new version, so, in order to be sure local and
- server fate samples are identical, when you use previous samples, run the
- following command:
+ server fate samples are identical, when you use previously saved samples,
+ run the following command:
rsync -vrltLW --delete --timeout=60 --contimeout=60 \
@@ -306,7 +314,7 @@ grep ^TEST ../fate.log | wc -l
- find ... ";": Fix permissions of documentation files
+ find ... ;: Fix permissions of documentation files
and directories.
diff --git a/packages.ent b/packages.ent
index 43b3fcda03..27aeaa3957 100644
--- a/packages.ent
+++ b/packages.ent
@@ -700,7 +700,7 @@
-
+