aboutsummaryrefslogtreecommitdiffstats
path: root/libavutil/fifo.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-08-28 00:14:40 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-08-28 00:15:05 +0200
commit3dd44e507536e85d81e4f10d1a9bf8fc6082d9ab (patch)
tree130d9b51952c16f670ac58e8109859ae04d16003 /libavutil/fifo.h
parent09a858da7d5535e78e9cf942a468aec411ffbf19 (diff)
parent10397215aa5682494138c300866f03bb9b75f062 (diff)
downloadffmpeg-3dd44e507536e85d81e4f10d1a9bf8fc6082d9ab.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: Use deinterleavers for demangling audio packets in RealMedia. vf_scale: don't leak SWS context. doxygen: drop another pointless star from pointer variable name Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/fifo.h')
-rw-r--r--libavutil/fifo.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavutil/fifo.h b/libavutil/fifo.h
index b84eaeab62..e1766ef322 100644
--- a/libavutil/fifo.h
+++ b/libavutil/fifo.h
@@ -111,7 +111,7 @@ void av_fifo_drain(AVFifoBuffer *f, int size);
* Return a pointer to the data stored in a FIFO buffer at a certain offset.
* The FIFO buffer is not modified.
*
- * @param *f AVFifoBuffer to peek at, f must be non-NULL
+ * @param f AVFifoBuffer to peek at, f must be non-NULL
* @param offs an offset in bytes, its absolute value must be less
* than the used buffer size or the returned pointer will
* point outside to the buffer data.