Merge branch 'master' of github.com:dpavlin/HTML5TV

Conflicts:
	media/elce2009-Linux_Measurement_Diagnostics/www.sh

diff --git a/media/elce2009-Linux_Measurement_Diagnostics/www.sh b/media/elce2009-Linux_Measurement_Diagnostics/www.sh
index 697f022..c955ff5 100755 (executable)
--- a/media/elce2009-Linux_Measurement_Diagnostics/www.sh
+++ b/media/elce2009-Linux_Measurement_Diagnostics/www.sh
@@ -1,4 +1,4 @@
 wget -nc -O survey_of_linux_measurement_and_diagnostic_tools.pdf \
        'http://tree.celinuxforum.org/CelfPubWiki/ELCEurope2009Presentations?action=AttachFile&do=get&target=survey_of_linux_measurement_and_diagnostic_tools.pdf'
 wget -nc http://free-electrons.com/pub/video/2009/elce/elce2009-rowand-measurement-diagnostic-tools.ogv && \
-       ffmpg2theora -p preview elce2009-rowand-measurement-diagnostic-tools.ogv
+       ffmpeg2theora -p preview -o elce2009-rowand-measurement-diagnostic-tools-preview.ogv elce2009-rowand-measurement-diagnostic-tools.ogv