Commit 115329f1 authored by Diego Biurrun's avatar Diego Biurrun
Browse files

COSMETICS: Remove all trailing whitespace.

Originally committed as revision 4749 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent d76319b1
......@@ -146,7 +146,7 @@ such a program is covered only if its contents constitute a work based
on the Library (independent of the use of the Library in a tool for
writing it). Whether that is true depends on what the Library does
and what the program that uses the Library does.
1. You may copy and distribute verbatim copies of the Library's
complete source code as you receive it, in any medium, provided that
you conspicuously and appropriately publish on each copy an
......
......@@ -11,7 +11,7 @@ version <next>
- Nullsoft Video (NSV) file demuxer
- Shorten audio decoder
- LOCO video decoder
- Apple Lossless Audio Codec (ALAC) decoder
- Apple Lossless Audio Codec (ALAC) decoder
- Winnov WNV1 video decoder
- Autodesk Animator Studio Codec (AASC) decoder
- Indeo 2 video decoder
......
This diff is collapsed.
1) Type './configure' create the configuration (use './configure
--help' to have the configure options).
--help' to have the configure options).
'configure' can be launched from another directory than the ffmpeg
sources to put the objects at that place. In that case, use an
......
......@@ -7,7 +7,7 @@ include config.mak
VPATH=$(SRC_PATH)
CFLAGS=$(OPTFLAGS) -I. -I$(SRC_PATH) -I$(SRC_PATH)/libavutil -I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libavformat -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
LDFLAGS+= -g
LDFLAGS+= -g
ifeq ($(TARGET_GPROF),yes)
CFLAGS+=-p
......@@ -75,7 +75,7 @@ ffmpeg$(EXESUF): ffmpeg_g$(EXESUF)
$(STRIP) $@
ffserver$(EXESUF): ffserver.o .libs
$(CC) $(LDFLAGS) $(FFSLDFLAGS) -o $@ ffserver.o $(FFLIBS) $(EXTRALIBS)
$(CC) $(LDFLAGS) $(FFSLDFLAGS) -o $@ ffserver.o $(FFLIBS) $(EXTRALIBS)
ffplay_g$(EXESUF): ffplay.o cmdutils.o .libs
$(CC) $(LDFLAGS) -o $@ ffplay.o cmdutils.o $(FFLIBS) $(EXTRALIBS) $(SDL_LIBS)
......@@ -94,10 +94,10 @@ cws2fws$(EXESUF): cws2fws.c
$(CC) $(SRC_PATH)/cws2fws.c -o cws2fws$(EXESUF) -lz
ffplay.o: ffplay.c
$(CC) $(CFLAGS) $(SDL_CFLAGS) -c -o $@ $<
$(CC) $(CFLAGS) $(SDL_CFLAGS) -c -o $@ $<
%.o: %.c
$(CC) $(CFLAGS) -c -o $@ $<
$(CC) $(CFLAGS) -c -o $@ $<
videohook: .libs
$(MAKE) -C vhook all
......
......@@ -11,7 +11,7 @@ FFmpeg README
* Read the file COPYING. ffmpeg and the associated libraries EXCEPT
liba52 and libpostproc are licensed under the Lesser GNU General
Public License.
Public License.
* liba52 and libpostproc are distributed under the GNU General Public
License and their compilation and use is optional in ffmpeg.
......
......@@ -8,37 +8,37 @@
#ifdef ENOENT
#undef ENOENT
#endif
#endif
#define ENOENT 2
#ifdef EINTR
#undef EINTR
#endif
#endif
#define EINTR 4
#ifdef EIO
#undef EIO
#endif
#endif
#define EIO 5
#ifdef EAGAIN
#undef EAGAIN
#endif
#endif
#define EAGAIN 11
#ifdef ENOMEM
#undef ENOMEM
#endif
#endif
#define ENOMEM 12
#ifdef EINVAL
#undef EINVAL
#endif
#endif
#define EINVAL 22
#ifdef EPIPE
#undef EPIPE
#endif
#endif
#define EPIPE 32
#endif /* BERRNO_H */
......@@ -7,4 +7,3 @@ sed 's/unsigned//g' |\
sed 's/TYPE_AVRATIONAL/TYPE_RATIONAL/g'|\
sed 's/FLOAT_M/FLT_M/g'|\
sed 's/FF_OPT_TYPE_CHAR/FF_OPT_TYPE_STRING/g'
\ No newline at end of file
......@@ -64,7 +64,7 @@ void parse_options(int argc, char **argv, const OptionDef *options)
optindex = 1;
while (optindex < argc) {
opt = argv[optindex++];
if (opt[0] == '-' && opt[1] != '\0') {
po= find_option(options, opt + 1);
if (!po->name)
......@@ -111,7 +111,7 @@ void print_error(const char *filename, int err)
fprintf(stderr, "%s: Incorrect image filename syntax.\n"
"Use '%%d' to specify the image number:\n"
" for img1.jpg, img2.jpg, ..., use 'img%%d.jpg';\n"
" for img001.jpg, img002.jpg, ..., use 'img%%03d.jpg'.\n",
" for img001.jpg, img002.jpg, ..., use 'img%%03d.jpg'.\n",
filename);
break;
case AVERROR_INVALIDDATA:
......
......@@ -555,7 +555,7 @@ for opt do
--enable-amr_nb-fixed) amr_nb_fixed="yes"
;;
--enable-amr_wb) amr_wb="yes"
;;
;;
--enable-amr_if2) amr_if2="yes"
;;
--enable-sunmlib) sunmlib="yes"
......@@ -629,13 +629,13 @@ if test "$gpl" != "yes"; then
echo "libdts is under GPL and --enable-gpl is not specified."
fail="yes"
fi
if test "$faad" != "no" -o "$faadbin" != "no"; then
cat > $TMPC << EOF
#include <faad.h>
int main( void ) { return 0; }
EOF
if $cc $CFLAGS -o $TMPE $TMPC 2> /dev/null ; then
cat > $TMPC << EOF
#include <faad.h>
......@@ -654,7 +654,7 @@ EOF
echo "FAAD test failed."
fi
fi
if test "$fail" = "yes"; then
exit 1
......@@ -673,7 +673,7 @@ fi
# check iwmmxt support
if test $iwmmxt = "default" -a $cpu = "armv4l"; then
cat > $TMPC << EOF
int main(void) {
int main(void) {
__asm__ __volatile__ ("wunpckelub wr6, wr4");
}
EOF
......@@ -692,7 +692,7 @@ if test $targetos = Darwin; then
else
gcc_version="`$cc -v 2>&1 | grep version | cut -d ' ' -f3-`"
case "$gcc_version" in
*2.95*)
*2.95*)
CFLAGS="$CFLAGS -no-cpp-precomp -pipe -fomit-frame-pointer"
;;
*[34].*)
......@@ -784,7 +784,7 @@ if test $tune != "generic"; then
esac
fi
# AltiVec flags: The FSF version of GCC differs from the Apple version
# AltiVec flags: The FSF version of GCC differs from the Apple version
if test $cpu = "powerpc"; then
if test $altivec = "yes"; then
if test -n "`$cc -v 2>&1 | grep version | grep Apple`"; then
......@@ -1009,7 +1009,7 @@ done
# currently only used on i386 for MMX builtins
cat > $TMPC << EOF
#include <xmmintrin.h>
int main(void) {
int main(void) {
#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 2)
return 0;
#else
......@@ -1812,7 +1812,7 @@ includedir=\${prefix}/include
Name: libavutil
Description: FFmpeg utility library
Version: $lavu_version
Requires:
Requires:
Conflicts:
Libs: -L\${libdir} -lavutil
Cflags: -I\${includedir} -I\${includedir}/ffmpeg
......@@ -1827,7 +1827,7 @@ includedir=\${pcfiledir}/libavutil
Name: libavutil
Description: FFmpeg utility library
Version: $lavu_version
Requires:
Requires:
Conflicts:
Libs: \${libdir}/${LIBPREF}avutil${LIBSUF}
Cflags: -I\${includedir}
......@@ -1906,7 +1906,7 @@ includedir=\${prefix}/include
Name: libpostproc
Description: FFmpeg post processing library
Version: $lavc_version
Requires:
Requires:
Conflicts:
Libs: -L\${libdir} -lpostproc
Cflags: -I\${includedir} -I\${includedir}/postproc
......@@ -1921,7 +1921,7 @@ includedir=\${pcfiledir}/libavcodec/libpostproc
Name: libpostproc
Description: FFmpeg post processing library
Version: $lavc_version
Requires:
Requires:
Conflicts:
Libs: \${libdir}/${LIBPREF}postproc${LIBSUF}
Cflags: -I\${includedir}
......
......@@ -28,7 +28,7 @@ main(int argc, char *argv[])
printf("Usage: %s <infile.swf> <outfile.swf>\n", argv[0]);
exit(1);
}
fd_in = open(argv[1], O_RDONLY);
if (fd_in < 0)
{
......@@ -43,7 +43,7 @@ main(int argc, char *argv[])
close(fd_in);
exit(1);
}
if (read(fd_in, &buf_in, 8) != 8)
{
printf("Header error\n");
......@@ -51,7 +51,7 @@ main(int argc, char *argv[])
close(fd_out);
exit(1);
}
if (buf_in[0] != 'C' || buf_in[1] != 'W' || buf_in[2] != 'S')
{
printf("Not a compressed flash file\n");
......@@ -61,7 +61,7 @@ main(int argc, char *argv[])
fstat(fd_in, &statbuf);
comp_len = statbuf.st_size;
uncomp_len = buf_in[4] | (buf_in[5] << 8) | (buf_in[6] << 16) | (buf_in[7] << 24);
printf("Compressed size: %d Uncompressed size: %d\n", comp_len-4, uncomp_len-4);
// write out modified header
......@@ -72,20 +72,20 @@ main(int argc, char *argv[])
zstream.zfree = NULL;
zstream.opaque = NULL;
inflateInit(&zstream);
for (i = 0; i < comp_len-4;)
{
int ret, len = read(fd_in, &buf_in, 1024);
dbgprintf("read %d bytes\n", len);
last_out = zstream.total_out;
zstream.next_in = &buf_in[0];
zstream.avail_in = len;
zstream.next_out = &buf_out[0];
zstream.avail_out = 1024;
ret = inflate(&zstream, Z_SYNC_FLUSH);
if (ret == Z_STREAM_END || ret == Z_BUF_ERROR)
break;
......@@ -95,16 +95,16 @@ main(int argc, char *argv[])
inflateEnd(&zstream);
exit(1);
}
dbgprintf("a_in: %d t_in: %d a_out: %d t_out: %d -- %d out\n",
zstream.avail_in, zstream.total_in, zstream.avail_out, zstream.total_out,
zstream.total_out-last_out);
write(fd_out, &buf_out, zstream.total_out-last_out);
i += len;
}
if (zstream.total_out != uncomp_len-8)
{
printf("Size mismatch (%d != %d), updating header...\n",
......@@ -114,11 +114,11 @@ main(int argc, char *argv[])
buf_in[1] = (zstream.total_out+8 >> 8) & 0xff;
buf_in[2] = (zstream.total_out+8 >> 16) & 0xff;
buf_in[3] = (zstream.total_out+8 >> 24) & 0xff;
lseek(fd_out, 4, SEEK_SET);
write(fd_out, &buf_in, 4);
}
inflateEnd(&zstream);
close(fd_in);
close(fd_out);
......
......@@ -5,13 +5,13 @@ Fabrice's TODO list: (unordered)
-------------------
Short term:
- av_read_frame() API
- av_read_frame() API
- seeking API and example in ffplay
- parse_only mode
- use AVFMTCTX_DISCARD_PKT in ffplay so that DV has a chance to work
- add RTSP regression test (both client and server)
- make ffserver allocate AVFormatContext
- clean up (incompatible change, for 0.5.0):
- clean up (incompatible change, for 0.5.0):
* AVStream -> AVComponent
* AVFormatContext -> AVInputStream/AVOutputStream
* suppress rate_emu from AVCodecContext
......@@ -54,7 +54,7 @@ Francois' TODO list: (unordered, without any timeframe)
Philip'a TODO list: (alphabetically ordered) (please help)
------------------
- Add a multi-ffm filetype so that feeds can be recorded into multiple files rather
than one big file.
than one big file.
- Authenticated users support -- where the authentication is in the URL
- Change ASF files so that the embedded timestamp in the frames is right rather
than being an offset from the start of the stream
......
......@@ -53,7 +53,7 @@ Use @file{-} as filename.
@section Why does ffmpeg not decode audio in VOB files ?
The audio is AC3 (a.k.a. A/52). AC3 decoding is an optional component in ffmpeg
as the component that handles AC3 decoding (liba52) is currently released under
as the component that handles AC3 decoding (liba52) is currently released under
the GPL. If you have liba52 installed on your system, enable AC3 decoding
with @code{./configure --enable-a52}. Take care: by
enabling AC3, you automatically change the license of libavcodec from
......@@ -61,7 +61,7 @@ LGPL to GPL.
@section Which codecs are supported by Windows ?
Windows does not support standard formats like MPEG very well, unless you
Windows does not support standard formats like MPEG very well, unless you
install some additional codecs
The following list of video codecs should work on most Windows systems:
......@@ -79,8 +79,8 @@ only if you have some MPEG-4 codec installed like ffdshow or XviD
@item mpeg1
.mpg only
@end table
Note, ASF files often have .wmv or .wma extensions in Windows. It should also
be mentioned that Microsoft claims a patent on the ASF format, and may sue
Note, ASF files often have .wmv or .wma extensions in Windows. It should also
be mentioned that Microsoft claims a patent on the ASF format, and may sue
or threaten users who create ASF files with non-Microsoft software. It is
strongly advised to avoid ASF where possible.
......@@ -95,7 +95,7 @@ if some MP3 codec like LAME is installed
@section Why does the chrominance data seem to be sampled at a different time from the luminance data on bt8x8 captures on Linux?
This is a well-known bug in the bt8x8 driver. For 2.4.26 there is a patch at
This is a well-known bug in the bt8x8 driver. For 2.4.26 there is a patch at
(@url{http://www.mplayerhq.hu/~michael/bttv-420-2.4.26.patch}). This may also
apply cleanly to other 2.4-series kernels.
......@@ -132,8 +132,8 @@ Both XviD and DivX (version 4+) are implementations of the ISO MPEG-4
standard (note that there are many other coding formats that use this
same standard). Thus, use '-vcodec mpeg4' to encode these formats. The
default fourcc stored in an MPEG-4-coded file will be 'FMP4'. If you want
a different fourcc, use the '-vtag' option. E.g., '-vtag xvid' will
force the fourcc 'xvid' to be stored as the video fourcc rather than the
a different fourcc, use the '-vtag' option. E.g., '-vtag xvid' will
force the fourcc 'xvid' to be stored as the video fourcc rather than the
default.
@chapter Development
......@@ -149,7 +149,7 @@ it implemented is to undertake the task yourself.
@section Are there examples illustrating how to use the FFmpeg libraries, particularly libavcodec and libavformat ?
Yes. Read the Developers Guide of the FFmpeg documentation. Alternatively,
examine the source code for one of the many open source projects that
examine the source code for one of the many open source projects that
already incorporate ffmpeg at (@url{projects.php}).
@section Can you support my C compiler XXX ?
......@@ -174,7 +174,7 @@ terms of portability.
@section Why not rewrite ffmpeg in object-oriented C++ ?
ffmpeg is already organized in a highly modular manner and does not need to
be rewritten in a formal object language. Further, many of the developers
be rewritten in a formal object language. Further, many of the developers
favor straight C; it works for them. For more arguments on this matter,
read "Programming Religion" at (@url{http://lkml.org/faq/lkmlfaq-15.html}).
......
......@@ -12,7 +12,7 @@
FFmpeg is a very fast video and audio converter. It can also grab from
a live audio/video source.
The command line interface is designed to be intuitive, in the sense
that FFmpeg tries to figure out all parameters that can possibly be
derived automatically. You usually only have to specify the target
......@@ -30,7 +30,7 @@ FFmpeg can use a video4linux compatible video source and any Open Sound
System audio source:
@example
ffmpeg /tmp/out.mpg
ffmpeg /tmp/out.mpg
@end example
Note that you must activate the right video source and channel before
......@@ -48,10 +48,10 @@ Examples:
* You can use YUV files as input:
@example
ffmpeg -i /tmp/test%d.Y /tmp/out.mpg
ffmpeg -i /tmp/test%d.Y /tmp/out.mpg
@end example
It will use the files:
It will use the files:
@example
/tmp/test0.Y, /tmp/test0.U, /tmp/test0.V,
/tmp/test1.Y, /tmp/test1.U, /tmp/test1.V, etc...
......@@ -130,7 +130,7 @@ NOTE: To see the supported input formats, use @code{ffmpeg -formats}.
The generic syntax is:
@example
@example
@c man begin SYNOPSIS
ffmpeg [[infile options][@option{-i} @var{infile}]]... @{[outfile options] @var{outfile}@}...
@c man end
......@@ -161,16 +161,16 @@ Show help.
@item -formats
Show available formats, codecs, protocols, ...
@item -f fmt
@item -f fmt
Force format.
@item -i filename
@item -i filename
input filename
@item -y
@item -y
Overwrite output files.
@item -t duration
@item -t duration
Set the recording time in seconds.
@code{hh:mm:ss[.xxx]} syntax is also supported.
......@@ -178,16 +178,16 @@ Set the recording time in seconds.
Seek to given time position in seconds.
@code{hh:mm:ss[.xxx]} syntax is also supported.
@item -title string
@item -title string
Set the title.
@item -author string
@item -author string
Set the author.
@item -copyright string
@item -copyright string
Set the copyright.
@item -comment string
@item -comment string
Set the comment.
@item -target type
......@@ -224,9 +224,9 @@ streams are delayed by 'offset' seconds.
@table @option
@item -b bitrate
Set the video bitrate in kbit/s (default = 200 kb/s).
@item -r fps
@item -r fps
Set frame rate (default = 25).
@item -s size
@item -s size
Set frame size. The format is @samp{wxh} (default = 160x128).
The following abbreviations are recognized:
@table @samp
......@@ -265,7 +265,7 @@ represent red, the middle two digits green and last two digits
blue (default = 000000 (black)).
@item -vn
Disable video recording.
@item -bt tolerance
@item -bt tolerance
Set video bitrate tolerance (in kbit/s).
@item -maxrate bitrate
Set max video bitrate tolerance (in kbit/s).
......@@ -273,19 +273,19 @@ Set max video bitrate tolerance (in kbit/s).
Set min video bitrate tolerance (in kbit/s).
@item -bufsize size
Set rate control buffer size (in kbit).
@item -vcodec codec
@item -vcodec codec
Force video codec to @var{codec}. Use the @code{copy} special value to
tell that the raw codec data must be copied as is.
@item -sameq
Use same video quality as source (implies VBR).
@item -pass n
@item -pass n
Select the pass number (1 or 2). It is useful to do two pass
encoding. The statistics of the video are recorded in the first
pass and the video is generated at the exact requested bitrate
in the second pass.
@item -passlogfile file
@item -passlogfile file
Set two pass logfile name to @var{file}.
@end table
......@@ -293,21 +293,21 @@ Set two pass logfile name to @var{file}.
@section Advanced Video Options
@table @option
@item -g gop_size
@item -g gop_size
Set the group of pictures size.
@item -intra
@item -intra
Use only intra frames.
@item -qscale q
@item -qscale q
Use fixed video quantiser scale (VBR).
@item -qmin q
@item -qmin q
minimum video quantiser scale (VBR)
@item -qmax q
@item -qmax q
maximum video quantiser scale (VBR)
@item -qdiff q
@item -qdiff q
maximum difference between the quantiser scales (VBR)
@item -qblur blur
@item -qblur blur
video quantiser scale blur (VBR)
@item -qcomp compression
@item -qcomp compression
video quantiser scale compression (VBR)
@item -rc_init_cplx complexity
......@@ -363,31 +363,31 @@ Set IDCT algorithm to @var{algo}. Available values are:
@item 0
FF_IDCT_AUTO (default)
@item 1
FF_IDCT_INT
FF_IDCT_INT
@item 2
FF_IDCT_SIMPLE
FF_IDCT_SIMPLE
@item 3
FF_IDCT_SIMPLEMMX
FF_IDCT_SIMPLEMMX
@item 4
FF_IDCT_LIBMPEG2MMX
FF_IDCT_LIBMPEG2MMX
@item 5
FF_IDCT_PS2
FF_IDCT_PS2
@item 6
FF_IDCT_MLIB
FF_IDCT_MLIB
@item 7
FF_IDCT_ARM
FF_IDCT_ARM
@item 8
FF_IDCT_ALTIVEC
FF_IDCT_ALTIVEC
@item 9
FF_IDCT_SH4
FF_IDCT_SH4
@item 10
FF_IDCT_SIMPLEARM
FF_IDCT_SIMPLEARM
@end table
@item -er n
Set error resilience to @var{n}.
@table @samp
@item 1
@item 1
FF_ER_CAREFUL (default)
@item 2
FF_ER_COMPLIANT
......@@ -453,9 +453,9 @@ name and its parameters separated by spaces.
@section Audio Options
@table @option
@item -ar freq
@item -ar freq
Set the audio sampling frequency (default = 44100 Hz).
@item -ab bitrate
@item -ab bitrate
Set the audio bitrate in kbit/s (default = 64).
@item -ac channels
Set the number of audio channels (default = 1).
......@@ -484,13 +484,13 @@ Set audio device (e.g. @file{/dev/dsp}).
@section Advanced options
@table @option
@item -map file:stream
@item -map file:stream
Set input stream mapping.
@item -debug
Print specific debug info.
@item -benchmark
@item -benchmark
Add timings for benchmarking.
@item -hex
@item -hex
Dump each input packet.
@item -bitexact
Only use bit exact algorithms (for codec testing).
......@@ -510,7 +510,7 @@ Repeatedly loop output for formats that support looping such as animated GIF
@section FFmpeg formula evaluator
When evaluating a rate control string, FFmpeg uses an internal formula