diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-02-29 00:30:35 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-02-29 00:30:35 +0100 |
| commit | 0e6aa0fef565fdb625673c60276e90c2ea091e8e (patch) | |
| tree | f0b08a7f4b465aaa0d9144e9b837b18294db3df6 /libavutil/avutil.h | |
| parent | f929abd0c3643b28a9552512d698cf61ad4d08fa (diff) | |
| parent | bbeb29133b55b7256d18f5aaab8b5c8e919a173a (diff) | |
| download | ffmpeg-0e6aa0fef565fdb625673c60276e90c2ea091e8e.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
adpcm: Clip step_index values read from the bitstream at the beginning of each frame.
oma: don't read beyond end of leaf_table.
doxygen: Remove documentation for non-existing parameters; misc small fixes.
Indeo3: fix crashes on corrupt bitstreams.
msmpeg4: Replace forward declaration by proper #include.
segment: implement wrap around
avf: reorder AVStream and AVFormatContext
aacdec: Remove erroneous reference to global gain from the out of bounds scalefactor error message.
Conflicts:
libavcodec/indeo3.c
libavformat/avformat.h
libavutil/avutil.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/avutil.h')
| -rw-r--r-- | libavutil/avutil.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavutil/avutil.h b/libavutil/avutil.h index fdd6cf141c..0f1fd0a6a6 100644 --- a/libavutil/avutil.h +++ b/libavutil/avutil.h @@ -31,7 +31,7 @@ * * @section libav_intro Introduction * - * This document describe the usage of the different libraries + * This document describes the usage of the different libraries * provided by FFmpeg. * * @li @ref libavc "libavcodec" encoding/decoding library @@ -41,7 +41,6 @@ * @li @ref lavu "libavutil" common utility library * @li @subpage libpostproc post processing library * @li @subpage libswscale color conversion and scaling library - * */ /** |