Stowage/ffmpeg
2
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-02-08 19:00:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge commit '5ce04c14dd'

Browse source 
* commit '5ce04c14dd':
  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
commit 2ece7d94bc
2 changed files with 4 additions and 4 deletions
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).
*
* @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;