summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/beamer/multimedia/multimedia.sty
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2011-09-13 22:52:08 +0000
committerKarl Berry <karl@freefriends.org>2011-09-13 22:52:08 +0000
commit72c8eee56c474d51318b0296700506a912d726ff (patch)
tree02ca21faf7cf7e175c46e4effc038911beefb081 /Master/texmf-dist/tex/latex/beamer/multimedia/multimedia.sty
parentf503033f36e49df5beb6e09aa7ca2cb6d6b31820 (diff)
beamer 3.11 (12sep11)
git-svn-id: svn://tug.org/texlive/trunk@23934 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/beamer/multimedia/multimedia.sty')
-rw-r--r--Master/texmf-dist/tex/latex/beamer/multimedia/multimedia.sty9
1 files changed, 4 insertions, 5 deletions
diff --git a/Master/texmf-dist/tex/latex/beamer/multimedia/multimedia.sty b/Master/texmf-dist/tex/latex/beamer/multimedia/multimedia.sty
index 136e65e00b4..2a497433fcb 100644
--- a/Master/texmf-dist/tex/latex/beamer/multimedia/multimedia.sty
+++ b/Master/texmf-dist/tex/latex/beamer/multimedia/multimedia.sty
@@ -1,5 +1,6 @@
% Copyright 2003--2007 by Till Tantau
% Copyright 2010 by Vedran Mileti\'c
+% Copyright 2011 by Vedran Mileti\'c, Joseph Wright
%
% This file may be distributed and/or modified
%
@@ -8,7 +9,7 @@
%
% See the file doc/licenses/LICENSE for more details.
-% $Header: /home/vedranm/bitbucket/beamer/base/multimedia/multimedia.sty,v 14743c450e2c 2010/06/17 09:25:56 rivanvx $
+% $Header: /Users/joseph/Documents/LaTeX/beamer/base/multimedia/multimedia.sty,v 70f9d8411e54 2011/09/12 18:58:34 joseph $
\ProvidesPackage{multimedia}[2004/04/10 ver 0.01]
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
@@ -16,11 +17,9 @@
\RequirePackage{keyval}[1997/11/10]
-\ifx\pdfoutput\@undefined
- \newcount\pdfoutput\pdfoutput=0
-\fi
+\RequirePackage{ifpdf}
-\ifnum\pdfoutput=0
+\ifpdf
\let\mm@psorpdf\@firstoftwo
\PassOptionsToPackage{pdfmark}{hyperref}
\define@key{PDF}{Movie}{\pdf@addtoks{#1}{Movie}}