diff options
| author | Michael Niedermayer | 2011-11-15 03:13:42 +0100 |
|---|---|---|
| committer | Michael Niedermayer | 2011-11-15 03:13:42 +0100 |
| commit | a72580fc9efeb674257b4754ca5de0fa34b09be8 (patch) | |
| tree | 317e10288d30721f1f20c6c5bb9d99945d4351bd /doc | |
| parent | be4c9a440f4e8b6ea01112d98a2cc128b8c52295 (diff) | |
| parent | 3f5d6a665aba439a9309ed735e71403d236a313d (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
binkvideo: simplify and remove invalid shifts
pulse: compute frame_duration once and fix it
lavf: simplify format_child_class_next()
hwaccel: OS X Video Decoder Acceleration (VDA) support.
doc: add support for an optional navigation bar in texi2html pages
Conflicts:
configure
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/vda.c
libavcodec/vda.h
libavcodec/vda_h264.c
libavcodec/vda_internal.h
libavcodec/version.h
libavformat/options.c
libavutil/avutil.h
libavutil/pixfmt.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/t2h.init | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/doc/t2h.init b/doc/t2h.init index 015712f699..ee87ac2230 100644 --- a/doc/t2h.init +++ b/doc/t2h.init @@ -9,9 +9,13 @@ $EXTRA_HEAD = <link rel="stylesheet" type="text/css" href="default.css" /> '; + +my $FFMPEG_NAVBAR = $ENV{"FFMPEG_NAVBAR"} || ''; + $AFTER_BODY_OPEN = -'<div id="container"> -<div id="body">'; +'<div id="container">' . +"\n$FFMPEG_NAVBAR\n" . +'<div id="body">'; $PRE_BODY_CLOSE = '</div></div>'; |