diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-12-13 00:29:25 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-12-13 00:39:48 +0100 |
| commit | 8bc7fe4daf5c26555d77e2261c96ee14a800fad4 (patch) | |
| tree | 71999a1eb8bacb609b5789b34de369ed4b049cd4 /tests | |
| parent | c83ef636a665b2e17f1b6745a98ec7a5719264df (diff) | |
| parent | 58c42af722cebecd86e340dc3ed9ec44b1fe4a55 (diff) | |
| download | ffmpeg-8bc7fe4daf5c26555d77e2261c96ee14a800fad4.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
doxygen: misc consistency, spelling and wording fixes
vcr1: drop unnecessary emms_c() calls without MMX code
Replace all uses of av_close_input_file() with avformat_close_input().
lavf: add avformat_close_input().
lavf: deprecate av_close_input_stream().
lavf doxy: add some basic demuxing documentation.
lavf doxy: add some general lavf information.
lavf doxy: add misc utility functions to a group.
lavf doxy: add av_guess_codec/format to the encoding group.
lavf doxy: add core functions to a doxy group.
Add basic libavdevice documentation.
lavc: convert error_recognition to err_recognition.
avconv: update -map option help text
x86: Require 7 registers for the cabac asm
x86: bswap: remove test for bswap instruction
bswap: make generic implementation more compiler-friendly
h264: remove useless cast
proresdec: fix decode_slice() prototype
Conflicts:
configure
doc/APIchanges
ffprobe.c
libavcodec/avcodec.h
libavcodec/celp_math.h
libavcodec/h264.c
libavfilter/src_movie.c
libavformat/anm.c
libavformat/avformat.h
libavformat/version.h
libavutil/avstring.h
libavutil/bswap.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/audiogen.c | 4 | ||||
| -rw-r--r-- | tests/rotozoom.c | 2 | ||||
| -rw-r--r-- | tests/videogen.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/tests/audiogen.c b/tests/audiogen.c index 852e04268b..493041f5d0 100644 --- a/tests/audiogen.c +++ b/tests/audiogen.c @@ -1,6 +1,6 @@ /* - * Generates a synthetic stereo sound - * NOTE: No floats are used to guarantee a bit exact output. + * Generate a synthetic stereo sound. + * NOTE: No floats are used to guarantee bitexact output. * * Copyright (c) 2002 Fabrice Bellard * diff --git a/tests/rotozoom.c b/tests/rotozoom.c index 822c2bce5e..1a4505729a 100644 --- a/tests/rotozoom.c +++ b/tests/rotozoom.c @@ -1,5 +1,5 @@ /* - * Generates a synthetic YUV video sequence suitable for codec testing. + * Generate a synthetic YUV video sequence suitable for codec testing. * * copyright (c) Sebastien Bechet <s.bechet@av7.net> * diff --git a/tests/videogen.c b/tests/videogen.c index 4238e3f862..bdd5a806ff 100644 --- a/tests/videogen.c +++ b/tests/videogen.c @@ -1,6 +1,6 @@ /* - * Generates a synthetic YUV video sequence suitable for codec testing. - * NOTE: No floats are used to guarantee a bit exact output. + * Generate a synthetic YUV video sequence suitable for codec testing. + * NOTE: No floats are used to guarantee bitexact output. * * Copyright (c) 2002 Fabrice Bellard * |