Commit e5fe4278 authored by Diego Biurrun's avatar Diego Biurrun

cosmetics: Remove all trailing whitespace.

parent 6e105eb5
......@@ -118,7 +118,7 @@ libdvdnav (0.1.0-1.1) unstable; urgency=low
(see patch from Jamie Wilkinson for a better solution)
-- Siggi Langauf <siggi@debian.org> Mon, 20 May 2002 15:57:40 +0200
libdvdnav (0.0.1-1) unstable; urgency=low
* Repackaged using dh-make.
......
......@@ -35,7 +35,7 @@ AC_SUBST(DVDNAV_MINOR)
AC_SUBST(DVDNAV_SUB)
dnl The libtool version numbers (DVDNAV_LT_*); Don't even think about faking this!
dnl
dnl
dnl immediately before every release do:
dnl ===================================
dnl if (the interface is totally unchanged from previous release)
......@@ -48,7 +48,7 @@ dnl AGE ++;
dnl if (any interfaces have been _removed_ or _incompatibly changed_)
dnl AGE = 0;
dnl }
dnl
dnl
dnl If you want to know more about what you are doing, here are some details:
dnl * DVDNAV_LT_CURRENT is the current API version
dnl * DVDNAV_LT_REVISION is an internal revision number which is increased when the API
......@@ -238,7 +238,7 @@ dnl ---------------------------------------------
dnl Output configuration files
dnl ---------------------------------------------
AC_OUTPUT([
Makefile
Makefile
src/Makefile
src/vm/Makefile
misc/Makefile
......
......@@ -123,7 +123,7 @@ case $targetos in
;;
esac
cat > config.mak << EOF
cat > config.mak << EOF
# Automatically generated by configure, do not edit
PREFIX=$PREFIX
libdir=$libdir
......
This diff is collapsed.
......@@ -22,12 +22,12 @@ should be directed to <tt>dvd-devel@lists.sf.net</tt>.
\subsection disclaimer Disclaimer
No liability for the contents of this documents can be accepted. Use the concepts,
examples and other content at your own risk. Additionally, this is an early version,
No liability for the contents of this documents can be accepted. Use the concepts,
examples and other content at your own risk. Additionally, this is an early version,
with many possibilities for inaccuracies and errors.
As far as I know, all of the programmes mentioned here and example code quoted are
released under the GNU General Public License or the Lesser GNU Public License.
As far as I know, all of the programmes mentioned here and example code quoted are
released under the GNU General Public License or the Lesser GNU Public License.
\subsection copyright Copyright information
......@@ -36,9 +36,9 @@ project. It is distributed under the following terms:
- This document may be reproduced and distributed in whole or in part, in any medium
physical or electronic, as long as this copyright notice is retained on all copies.
Commercial redistribution is allowed and encouraged; however, the author would like
Commercial redistribution is allowed and encouraged; however, the author would like
to be notified of any such distributions.
- All translations, derivative works, or aggregate works incorporating any parts of
- All translations, derivative works, or aggregate works incorporating any parts of
this document must be covered under this copyright notice. That is, you may not produce
a derivative work from this manual and impose additional restrictions on its distribution.
......
......@@ -2,7 +2,7 @@
The <tt>libdvdnav</tt> library provides a powerful API allowing your
programs to take advantage of the sophisticated navigation features
on DVDs.
on DVDs.
\subsection wherenow Tutorial sections
......@@ -12,13 +12,13 @@ on DVDs.
- For a step-by step walkthrough of a simple program look in
section \ref firstprog .
- FIXME: More sections :)
*/
/*! \page dvdnavissues An introduction to DVD navigation
The DVD format represents a radical departure from the traditional
form of video home-entertainment. Instead of just being a linear
form of video home-entertainment. Instead of just being a linear
programme which is watched from beginning to end like a novel
DVD allows the user to jump about at will (much like those
'Choose your own adventure' or 'Which Way' books which were
......@@ -42,7 +42,7 @@ A typical DVD might have the following structure:
| |-- Chapter 1
| | |-- Cell 1
| | | |-- VOBU 1
| | | |-- ...
| | | |-- ...
| | | `-- VOBU n
| | |-- ...
| | `-- Cell n
......@@ -50,7 +50,7 @@ A typical DVD might have the following structure:
| `-- Chapter 2
| |-- Cell 1
| | |-- VOBU 1
| | |-- ...
| | |-- ...
| | `-- VOBU n
| |-- ...
| `-- Cell n
......@@ -59,7 +59,7 @@ A typical DVD might have the following structure:
|-- Chapter 1
| |-- Cell 1
| | |-- VOBU 1
| | |-- ...
| | |-- ...
| | `-- VOBU n
| |-- ...
| `-- Cell n
......@@ -67,7 +67,7 @@ A typical DVD might have the following structure:
`-- Chapter 2
|-- Cell 1
| |-- VOBU 1
| |-- ...
| |-- ...
| `-- VOBU n
|-- ...
`-- Cell n
......@@ -96,7 +96,7 @@ the location jumped to is always the start of a valid MPEG stream. For multiple-
DVDs VOBUs for each angle can be interleaved into one Interleaved Video Unit (ILVU).
In this case when the player get to the end of the VOBU for angle <i>n</i> instead of
jumping to the next VOBU the player will move forward to the VOBU for angle <i>n</i>
in the next ILVU.
in the next ILVU.
This is summarised in the following diagram showing how the VOBUs are actually
laid out on disc.
......@@ -117,9 +117,9 @@ If the layout of the DVD were the only feature of the format the DVD
would only have a limited amount of interactivity, you could jump
around between Titles, Parts and Cells but not much else.
The feature most people associate with DVDs is its ability to
The feature most people associate with DVDs is its ability to
present the user with full-motion interactive menus. To provide
these features the DVD format includes a specification for a
these features the DVD format includes a specification for a
DVD 'virtual machine'.
To a first order approximation x86 programs can only be run on
......@@ -161,13 +161,13 @@ int main(int argc, char **argv) {
dvdnav_t *dvdnav;
int finished, len, event;
uint8_t buf[2050];
/* Open the DVD */
dvdnav_open(&dvdnav, "/dev/dvd");
fprintf(stderr, "Reading...\n");
finished = 0;
while(!finished) {
while(!finished) {
int result = dvdnav_get_next_block(dvdnav, buf,
&event, &len);
......@@ -182,7 +182,7 @@ int main(int argc, char **argv) {
/* Write output to stdout */
fwrite(buf, len, 1, stdout);
break;
case DVDNAV_STILL_FRAME:
case DVDNAV_STILL_FRAME:
{
fprintf(stderr, "Skipping still frame\n");
dvdnav_still_skip(dvdnav);
......@@ -198,11 +198,11 @@ int main(int argc, char **argv) {
break;
}
}
dvdnav_close(dvdnav);
return 0;
}
}
\endverbatim
If you have correctly installled <tt>libdvdnav</tt>, you should have the
......
dnl Configure paths for DVDNAV
dnl
dnl Copyright (C) 2001 Daniel Caujolle-Bert <segfault@club-internet.fr>
dnl
dnl
dnl This program is free software; you can redistribute it and/or modify
dnl it under the terms of the GNU General Public License as published by
dnl the Free Software Foundation; either version 2 of the License, or
dnl (at your option) any later version.
dnl
dnl
dnl This program is distributed in the hope that it will be useful,
dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
dnl GNU General Public License for more details.
dnl
dnl
dnl You should have received a copy of the GNU General Public License
dnl along with this program; if not, write to the Free Software
dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
dnl
dnl
dnl
dnl
dnl As a special exception to the GNU General Public License, if you
dnl distribute this file as part of a program that contains a configuration
dnl script generated by Autoconf, you may include it under the same
dnl distribution terms that you use for the rest of that program.
dnl
dnl
dnl AM_PATH_DVDNAV([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
dnl Test for DVDNAV, and define DVDNAV_CFLAGS and DVDNAV_LIBS
dnl
AC_DEFUN([AM_PATH_DVDNAV],
[dnl
[dnl
dnl Get the cflags and libraries from the dvdnav-config script
dnl
AC_ARG_WITH(dvdnav-prefix,
......@@ -36,7 +36,7 @@ AC_ARG_WITH(dvdnav-prefix,
AC_ARG_WITH(dvdnav-exec-prefix,
AC_HELP_STRING([--with-dvdnav-exec-prefix=DIR], [exec prefix where DVDNAV is installed (optional)]),
dvdnav_config_exec_prefix="$withval", dvdnav_config_exec_prefix="")
AC_ARG_ENABLE(dvdnavtest,
AC_ARG_ENABLE(dvdnavtest,
AC_HELP_STRING([--disable-dvdnavtest], [do not try to compile and run a test DVDNAV program]),
enable_dvdnavtest=$enableval, enable_dvdnavtest=yes)
......@@ -89,7 +89,7 @@ dnl
#include <stdlib.h>
#include <string.h>
int
int
main ()
{
int major, minor, sub;
......@@ -133,7 +133,7 @@ main ()
fi
if test "x$no_dvdnav" = x ; then
AC_MSG_RESULT(yes)
ifelse([$2], , :, [$2])
ifelse([$2], , :, [$2])
else
AC_MSG_RESULT(no)
if test "$DVDNAV_CONFIG" = "no" ; then
......
......@@ -85,4 +85,4 @@ fi
if test "$echo_minilibs" = "yes"; then
echo -L@libdir@ -ldvdnavmini @THREAD_LIBS@
fi
fi
......@@ -65,7 +65,7 @@ fi
if test "$echo_libs" = "yes"; then
echo -L$libdir -ldvdnav $dvdread_libs $threadlib
fi
fi
if test "$echo_minilibs" = "yes"; then
echo -L$libdir -ldvdnavmini $threadlib
......
......@@ -21,7 +21,7 @@ DVD navigation features.
%setup
%build
CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{prefix}
CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{prefix}
make
%install
......
......@@ -14,7 +14,7 @@ getdir() {
else
filelist=`ls`
fi
for file in $filelist; do
if test -d $file -a $file != "CVS" -a $file != $distdir; then
......@@ -60,7 +60,7 @@ main() {
echo " * Log is ${log##*/}"
echo " * Error log is ${logerror##*/}"
}
main
......@@ -7,19 +7,19 @@
CFG=ifo_dump - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE
!MESSAGE NMAKE /f "ifo_dump.mak".
!MESSAGE
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE
!MESSAGE NMAKE /f "ifo_dump.mak" CFG="ifo_dump - Win32 Debug"
!MESSAGE
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE
!MESSAGE "ifo_dump - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE "ifo_dump - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
......@@ -76,7 +76,7 @@ LINK32=link.exe
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /out:"Debug/bin/ifo_dump.exe" /pdbtype:sept
# SUBTRACT LINK32 /pdb:none
!ENDIF
!ENDIF
# Begin Target
......
MSVC Help
---------
In order to build using any application that requires libdvdnav using MSVC the
following directories (lib and include) must be copied to the msvc directory of
the particular application.
In order to build using any application that requires libdvdnav using MSVC the
following directories (lib and include) must be copied to the msvc directory of
the particular application.
......@@ -7,19 +7,19 @@
CFG=libdvdcss - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE
!MESSAGE NMAKE /f "libdvdcss.mak".
!MESSAGE
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE
!MESSAGE NMAKE /f "libdvdcss.mak" CFG="libdvdcss - Win32 Debug"
!MESSAGE
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE
!MESSAGE "libdvdcss - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "libdvdcss - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
......@@ -93,7 +93,7 @@ PostBuild_Desc=Create libdvdcss Install
PostBuild_Cmds=scripts\libdvdcss_intstall.bat Debug
# End Special Build Tool
!ENDIF
!ENDIF
# Begin Target
......
......@@ -7,19 +7,19 @@
CFG=libdvdnav - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE
!MESSAGE NMAKE /f "libdvdnav.mak".
!MESSAGE
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE
!MESSAGE NMAKE /f "libdvdnav.mak" CFG="libdvdnav - Win32 Debug"
!MESSAGE
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE
!MESSAGE "libdvdnav - Win32 Release" (based on "Win32 (x86) Static Library")
!MESSAGE "libdvdnav - Win32 Debug" (based on "Win32 (x86) Static Library")
!MESSAGE
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
......@@ -94,7 +94,7 @@ PostBuild_Desc=Create libdvdnav Install Files
PostBuild_Cmds=scripts\libdvdnav_install.bat Debug
# End Special Build Tool
!ENDIF
!ENDIF
# Begin Target
......
......@@ -7,19 +7,19 @@
CFG=libwin32utils - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE
!MESSAGE NMAKE /f "libwin32utils.mak".
!MESSAGE
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE
!MESSAGE NMAKE /f "libwin32utils.mak" CFG="libwin32utils - Win32 Debug"
!MESSAGE
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE
!MESSAGE "libwin32utils - Win32 Release" (based on "Win32 (x86) Static Library")
!MESSAGE "libwin32utils - Win32 Debug" (based on "Win32 (x86) Static Library")
!MESSAGE
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
......@@ -86,7 +86,7 @@ BSC32=bscmake.exe
LIB32=link.exe -lib
# ADD LIB32 winmm.lib /out:"libwin32utils.lib"
!ENDIF
!ENDIF
# Begin Target
......
......@@ -7,19 +7,19 @@
CFG=play_title - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE
!MESSAGE NMAKE /f "play_title.mak".
!MESSAGE
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE
!MESSAGE NMAKE /f "play_title.mak" CFG="play_title - Win32 Debug"
!MESSAGE
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE
!MESSAGE "play_title - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE "play_title - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
......@@ -75,7 +75,7 @@ LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /out:"Debug/bin/play_title.exe" /pdbtype:sept
!ENDIF
!ENDIF
# Begin Target
......
......@@ -7,19 +7,19 @@
CFG=title_info - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE
!MESSAGE NMAKE /f "title_info.mak".
!MESSAGE
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE
!MESSAGE NMAKE /f "title_info.mak" CFG="title_info - Win32 Debug"
!MESSAGE
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE
!MESSAGE "title_info - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE "title_info - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
......@@ -75,7 +75,7 @@ LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /out:"Debug/bin/title_info.exe" /pdbtype:sept
!ENDIF
!ENDIF
# Begin Target
......
......@@ -7,7 +7,7 @@ domain 8, title 1, program 1, start 0x0000, end 0x1f0a # Introduction
domain 2, title 1, program 1, start 0x11ff3, end 0x1272c # gore
#domain 2, title 1, program 1, start 0x173f1, end 0x185d6 # violence/death
# hobbiton
# hobbiton
domain 2, title 1, program 2, start 0x30373, end 0x31946 # vices/smoking
domain 2, title 1, program 2, start 0x32942, end 0x34426 # vices/smoking
domain 2, title 1, program 2, start 0x34895, end 0x34ad1 # vices/smoking
......@@ -20,7 +20,7 @@ domain 2, title 1, program 3, start 0x4cfbe, end 0x4f955 # vices/smoking
# party
domain 2, title 1, program 4, start 0x53ee0, end 0x54396 # vices/drinking
domain 2, title 1, program 4, start 0x58851, end 0x5ae3d # imitative/theft
domain 2, title 1, program 4, start 0x5cd0a, end 0x5e216 # jump
domain 2, title 1, program 4, start 0x5cd0a, end 0x5e216 # jump
# gandalf departs
domain 2, title 1, program 6, start 0x7f05d, end 0x7f1b3 # jump
......
......@@ -10,22 +10,22 @@ WHAT ARE MAP FILES
Map files are an experimental feature that lets you customize the way
you watch DVDs. If you are opposed to violence, are sickened by gore,
or would rather your two year old didn't ask you just yet why that
woman in the movie was naked, you might want to create a map file.
or would rather your two year old didn't ask you just yet why that
woman in the movie was naked, you might want to create a map file.
Map files identify sections of the movie that will be skipped during
playback. You can skip any section you like with the only restriction
(right now) that the movie player must play at least the last VOBU
(right now) that the movie player must play at least the last VOBU
(about a fifth of a second) of each chapter in the movie in order
to detect chapter changes correctly.
to detect chapter changes correctly.
Included with this patch is an example map file that describes most
of the potentially objectionable content in the new "The Lord of the
Rings" DVD. I've added a comment after each block that identifies
of the potentially objectionable content in the new "The Lord of the
Rings" DVD. I've added a comment after each block that identifies
what content it contains so that you can customize the file to your
preferences. The map file looks something like this:
# The Lord of the Rings: Fellowship of the Ring
# The Lord of the Rings: Fellowship of the Ring
# (Widescreen Theatrical Release)
debug
domain 8, title 1, program 1, start 0x0000, end 0x1f0a # Introduction
......@@ -55,7 +55,7 @@ HOWTO
To create your own map files you would create a new map file using the
title of the disk as the filename, and add the debug line to it. The
map file should be placed in your '.xine' directory and have a '.map'
extension added. For example "The Lord Of The Rings" map must be stored
extension added. For example "The Lord Of The Rings" map must be stored
in the file ~/.xine/FELLOWSHIP.map
After you create the file with the DEBUG line you will see output that
......@@ -77,7 +77,7 @@ map file:
domain 8, title 1, program 1, start 0x2205, end 0x248a # 4 blocks
Xine uses a buffered input chain so that if you pause the viewer you
won't find the same VOBU being displayed on the terminal as is
won't find the same VOBU being displayed on the terminal as is
currently on the screen. In my testing the correct VOBU to use if
you pause exactly on the section you want to cut will be about five
or six lines above the last one printed to the screen. Replay the
......@@ -96,10 +96,10 @@ WHOM TO BLAME
=============
If the patch doesn't work for you (and you want it to) you can contact
me at 'kevin_smathers@hp.com'.
me at 'kevin_smathers@hp.com'.
If the patch works for you and you don't want it to, remember that
not everyone in the world has the same needs. The freedom to censor
movies in our own homes is quite different from the government
interfering into libraries and other public forums to censor movies
If the patch works for you and you don't want it to, remember that
not everyone in the world has the same needs. The freedom to censor
movies in our own homes is quite different from the government
interfering into libraries and other public forums to censor movies
for us.
......@@ -11,6 +11,6 @@ libdvdvm_la_SOURCES = decoder.c vm.c vmcmd.c
libdvdvm_la_LDFLAGS = $(THREAD_LIBS)
include_HEADERS =
include_HEADERS =
noinst_HEADERS = decoder.h vm.h vmcmd.h
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment