diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-03 21:29:38 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-03 21:29:38 +0200 |
| commit | 2ece7d94bc35ba0ee2b650caec25853b9fcc2eb7 (patch) | |
| tree | a9d134456b0ac8c0216b68ec61d6a60aaf0496f2 | |
| parent | 16bb8faac6d51e342b64974ceb2f8edd7955f9fa (diff) | |
| parent | 5ce04c14dd3dd3670cbdba82275a3a72c716ec6f (diff) | |
| download | ffmpeg-2ece7d94bc35ba0ee2b650caec25853b9fcc2eb7.tar.gz | |
Merge commit '5ce04c14dd3dd3670cbdba82275a3a72c716ec6f'
* commit '5ce04c14dd3dd3670cbdba82275a3a72c716ec6f':
Use correct Doxygen syntax
Conflicts:
libavcodec/atrac3.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/videodsp.h | 6 | ||||
| -rw-r--r-- | libavutil/pixdesc.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/videodsp.h b/libavcodec/videodsp.h index e85dff355c..e1f7ee586f 100644 --- a/libavcodec/videodsp.h +++ b/libavcodec/videodsp.h @@ -66,9 +66,9 @@ typedef struct VideoDSPContext { /** * Prefetch memory into cache (if supported by hardware). * - * @buf pointer to buffer to prefetch memory from - * @stride distance between two lines of buf (in bytes) - * @h number of lines to prefetch + * @param buf pointer to buffer to prefetch memory from + * @param stride distance between two lines of buf (in bytes) + * @param h number of lines to prefetch */ void (*prefetch)(uint8_t *buf, ptrdiff_t stride, int h); } VideoDSPContext; diff --git a/libavutil/pixdesc.h b/libavutil/pixdesc.h index 67b8dbc1a2..e88bf9b92a 100644 --- a/libavutil/pixdesc.h +++ b/libavutil/pixdesc.h @@ -125,7 +125,7 @@ typedef struct AVPixFmtDescriptor{ #if FF_API_PIX_FMT /** - * @deprecate use the AV_PIX_FMT_FLAG_* flags + * @deprecated use the AV_PIX_FMT_FLAG_* flags */ #define PIX_FMT_BE AV_PIX_FMT_FLAG_BE #define PIX_FMT_PAL AV_PIX_FMT_FLAG_PAL |