consistent with r19122. Originally committed as revision 20989 to svn://svn.ffmpeg.org/ffmpeg/trunktags/v0.6
@@ -3420,7 +3420,7 @@ void ff_mpeg4_clean_buffers(MpegEncContext *s) | |||||
* finds the next resync_marker | * finds the next resync_marker | ||||
* @param p pointer to buffer to scan | * @param p pointer to buffer to scan | ||||
* @param end pointer to the end of the buffer | * @param end pointer to the end of the buffer | ||||
* @return pointer to the next resync_marker, or \p end if none was found | |||||
* @return pointer to the next resync_marker, or end if none was found | |||||
*/ | */ | ||||
const uint8_t *ff_h263_find_resync_marker(const uint8_t *restrict p, const uint8_t * restrict end) | const uint8_t *ff_h263_find_resync_marker(const uint8_t *restrict p, const uint8_t * restrict end) | ||||
{ | { | ||||
@@ -933,7 +933,7 @@ static void rtsp_skip_packet(AVFormatContext *s) | |||||
* @param s RTSP demuxer context | * @param s RTSP demuxer context | ||||
* @param reply pointer where the RTSP message header will be stored | * @param reply pointer where the RTSP message header will be stored | ||||
* @param content_ptr pointer where the RTSP message body, if any, will | * @param content_ptr pointer where the RTSP message body, if any, will | ||||
* be stored (length is in \p reply) | |||||
* be stored (length is in reply) | |||||
* @param return_on_interleaved_data whether the function may return if we | * @param return_on_interleaved_data whether the function may return if we | ||||
* encounter a data marker ('$'), which precedes data | * encounter a data marker ('$'), which precedes data | ||||
* packets over interleaved TCP/RTSP connections. If this | * packets over interleaved TCP/RTSP connections. If this | ||||
@@ -67,7 +67,7 @@ void *av_malloc(unsigned int size) av_malloc_attrib av_alloc_size(1); | |||||
/** | /** | ||||
* Allocates or reallocates a block of memory. | * Allocates or reallocates a block of memory. | ||||
* If ptr is NULL and size > 0, allocates a new block. If \p | |||||
* If ptr is NULL and size > 0, allocates a new block. If | |||||
* size is zero, frees the memory block pointed to by ptr. | * size is zero, frees the memory block pointed to by ptr. | ||||
* @param size Size in bytes for the memory block to be allocated or | * @param size Size in bytes for the memory block to be allocated or | ||||
* reallocated. | * reallocated. | ||||