RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '5ce04c14dd3dd3670cbdba82275a3a72c716ec6f' 

* commit '5ce04c14dd3dd3670cbdba82275a3a72c716ec6f':
  Use correct Doxygen syntax

Conflicts:
	libavcodec/atrac3.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-10-03 21:29:38 +02:00
parent 16bb8faac6 5ce04c14dd
commit 2ece7d94bc
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/videodsp.h
View File

@ -66,9 +66,9 @@ typedef struct VideoDSPContext {
/** /**
* Prefetch memory into cache (if supported by hardware). * Prefetch memory into cache (if supported by hardware).
* *
* @buf pointer to buffer to prefetch memory from * @param buf pointer to buffer to prefetch memory from
* @stride distance between two lines of buf (in bytes) * @param stride distance between two lines of buf (in bytes)
* @h number of lines to prefetch * @param h number of lines to prefetch
*/ */
void (*prefetch)(uint8_t *buf, ptrdiff_t stride, int h); void (*prefetch)(uint8_t *buf, ptrdiff_t stride, int h);
} VideoDSPContext; } VideoDSPContext;

2
libavutil/pixdesc.h
View File

@ -125,7 +125,7 @@ typedef struct AVPixFmtDescriptor{
#if FF_API_PIX_FMT #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_BE AV_PIX_FMT_FLAG_BE
#define PIX_FMT_PAL AV_PIX_FMT_FLAG_PAL #define PIX_FMT_PAL AV_PIX_FMT_FLAG_PAL