diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2011-07-15 17:40:51 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2011-07-15 17:51:09 +0200 |
commit | 042f9d62ca42a6ca26ef6ff23c6078c9ecc90c18 (patch) | |
tree | fe6d6db2945987a5c10923fb28515361eea6eab2 /libavutil | |
parent | e6cc30c22bb2007e4d66302d6477176ecf0c0877 (diff) | |
parent | e3bc07f4af25287fa4ade1e9c5501de65c8a698e (diff) | |
download | ffmpeg-042f9d62ca42a6ca26ef6ff23c6078c9ecc90c18.tar.gz |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
configure: Automatically add more flags required on symbian
mem.h: switch doxygen parameter order to match function prototype
doxygen: replace @sa tag by the more readable but equivalent @see
doxygen: use Doxygen markup for authors and web links where appropriate
doxygen: do not include license boilerplate in Doxygen documentation
ac3enc: Mark AVClasses const
ffserver: Replace two loops with one loop.
ffmpeg: Fix the check for experimental codecs
swscale: extend mmx padding.
swscale: clip unscaled colorspace conversion path.
doxygen: misc consistency cosmetics
doc: remove file name from @file directive in Doxygen usage example
doxygen: consistently place brief description
doxygen: place empty line between brief description and detailed description
avformat_open_input(): Add braces to shut up gcc warning.
Conflicts:
libavcodec/8svx.c
libavcodec/tiff.c
libavcodec/tiff.h
libavcodec/vaapi_h264.c
libavcodec/vorbis.c
libavcodec/vorbisdec.c
libavcodec/vp6.c
libswscale/swscale_unscaled.c
libswscale/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil')
-rw-r--r-- | libavutil/mem.h | 4 | ||||
-rw-r--r-- | libavutil/timer.h | 10 |
2 files changed, 8 insertions, 6 deletions
diff --git a/libavutil/mem.h b/libavutil/mem.h index 7c30e160fb..8fdf5b3a4d 100644 --- a/libavutil/mem.h +++ b/libavutil/mem.h @@ -76,10 +76,10 @@ void *av_malloc(size_t size) av_malloc_attrib av_alloc_size(1); * Allocate or reallocate a block of memory. * If ptr is NULL and size > 0, allocate a new block. If * size is zero, free the memory block pointed to by ptr. - * @param size Size in bytes for the memory block to be allocated or - * reallocated. * @param ptr Pointer to a memory block already allocated with * av_malloc(z)() or av_realloc() or NULL. + * @param size Size in bytes for the memory block to be allocated or + * reallocated. * @return Pointer to a newly reallocated block or NULL if the block * cannot be reallocated or the function is used to free the memory block. * @see av_fast_realloc() diff --git a/libavutil/timer.h b/libavutil/timer.h index cd8fba8ded..8a0cad56ca 100644 --- a/libavutil/timer.h +++ b/libavutil/timer.h @@ -1,7 +1,4 @@ -/** - * @file - * high precision timer, useful to profile code - * +/* * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at> * * This file is part of FFmpeg. @@ -21,6 +18,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +/** + * @file + * high precision timer, useful to profile code + */ + #ifndef AVUTIL_TIMER_H #define AVUTIL_TIMER_H |