aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
diff options
context:
space:
mode:
authorBenoit Fouet <benoit.fouet@free.fr>2010-03-30 15:50:57 +0000
committerBenoit Fouet <benoit.fouet@free.fr>2010-03-30 15:50:57 +0000
commit32e543f866d9d4b450729e93cd81dacd8c457971 (patch)
tree3e4271e8f798d25c3868584a04dcb52df3eff83f /libavformat
parent3bccd93ac0b7e5dbb4a335257eaee9d8908dad3c (diff)
downloadffmpeg-32e543f866d9d4b450729e93cd81dacd8c457971.tar.gz
Replace @returns by @return.
Originally committed as revision 22729 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/asfdec.c4
-rw-r--r--libavformat/avformat.h2
-rw-r--r--libavformat/avio.h4
-rw-r--r--libavformat/nutdec.c2
-rw-r--r--libavformat/rm.h2
-rw-r--r--libavformat/rtsp.c2
-rw-r--r--libavformat/rtsp.h4
7 files changed, 10 insertions, 10 deletions
diff --git a/libavformat/asfdec.c b/libavformat/asfdec.c
index 80ac0c29a5..882614be3d 100644
--- a/libavformat/asfdec.c
+++ b/libavformat/asfdec.c
@@ -638,7 +638,7 @@ static int asf_read_header(AVFormatContext *s, AVFormatParameters *ap)
* Load a single ASF packet into the demuxer.
* @param s demux context
* @param pb context to read data from
- * @returns 0 on success, <0 on error
+ * @return 0 on success, <0 on error
*/
static int ff_asf_get_packet(AVFormatContext *s, ByteIOContext *pb)
{
@@ -801,7 +801,7 @@ static int asf_read_frame_header(AVFormatContext *s, ByteIOContext *pb){
* @param s demux context
* @param pb context to read data from
* @param pkt pointer to store packet data into
- * @returns 0 if data was stored in pkt, <0 on error or 1 if more ASF
+ * @return 0 if data was stored in pkt, <0 on error or 1 if more ASF
* packets need to be loaded (through asf_get_packet())
*/
static int ff_asf_parse_packet(AVFormatContext *s, ByteIOContext *pb, AVPacket *pkt)
diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 59456c627b..92fd85c703 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -1003,7 +1003,7 @@ int av_seek_frame(AVFormatContext *s, int stream_index, int64_t timestamp,
* @param ts target timestamp
* @param max_ts largest acceptable timestamp
* @param flags flags
- * @returns >=0 on success, error code otherwise
+ * @return >=0 on success, error code otherwise
*
* @NOTE This is part of the new seek API which is still under construction.
* Thus do not use this yet. It may change at any time, do not expect
diff --git a/libavformat/avio.h b/libavformat/avio.h
index 58e6eab45c..649de15ea9 100644
--- a/libavformat/avio.h
+++ b/libavformat/avio.h
@@ -376,7 +376,7 @@ void put_flush_packet(ByteIOContext *s);
/**
* Reads size bytes from ByteIOContext into buf.
- * @returns number of bytes read or AVERROR
+ * @return number of bytes read or AVERROR
*/
int get_buffer(ByteIOContext *s, unsigned char *buf, int size);
@@ -384,7 +384,7 @@ int get_buffer(ByteIOContext *s, unsigned char *buf, int size);
* Reads size bytes from ByteIOContext into buf.
* This reads at most 1 packet. If that is not enough fewer bytes will be
* returned.
- * @returns number of bytes read or AVERROR
+ * @return number of bytes read or AVERROR
*/
int get_partial_buffer(ByteIOContext *s, unsigned char *buf, int size);
diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c
index d08683f54a..3dbca9eeb3 100644
--- a/libavformat/nutdec.c
+++ b/libavformat/nutdec.c
@@ -136,7 +136,7 @@ static uint64_t find_any_startcode(ByteIOContext *bc, int64_t pos){
* Find the given startcode.
* @param code the startcode
* @param pos the start position of the search, or -1 if the current position
- * @returns the position of the startcode or -1 if not found
+ * @return the position of the startcode or -1 if not found
*/
static int64_t find_startcode(ByteIOContext *bc, uint64_t code, int64_t pos){
for(;;){
diff --git a/libavformat/rm.h b/libavformat/rm.h
index f5110b93e1..4e63114a11 100644
--- a/libavformat/rm.h
+++ b/libavformat/rm.h
@@ -85,7 +85,7 @@ int ff_rm_parse_packet (AVFormatContext *s, ByteIOContext *pb,
* @param st stream that this packet belongs to
* @param rst Real-specific stream information
* @param pkt location to store the packet data
- * @returns the number of samples left for subsequent calls to this same
+ * @return the number of samples left for subsequent calls to this same
* function, or 0 if all samples have been retrieved.
*/
int ff_rm_retrieve_cache (AVFormatContext *s, ByteIOContext *pb,
diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c
index a1cb072fe6..a675e9a333 100644
--- a/libavformat/rtsp.c
+++ b/libavformat/rtsp.c
@@ -1080,7 +1080,7 @@ retry:
}
/**
- * @returns 0 on success, <0 on error, 1 if protocol is unavailable.
+ * @return 0 on success, <0 on error, 1 if protocol is unavailable.
*/
static int make_setup_request(AVFormatContext *s, const char *host, int port,
int lower_transport, const char *real_challenge)
diff --git a/libavformat/rtsp.h b/libavformat/rtsp.h
index 2c0be087aa..357d3bfc0c 100644
--- a/libavformat/rtsp.h
+++ b/libavformat/rtsp.h
@@ -404,7 +404,7 @@ void ff_rtsp_send_cmd(AVFormatContext *s, const char *method,
* has been fully parsed. If no more data is available
* without parsing a reply, it will return an error.
*
- * @returns 1 if a data packets is ready to be received, -1 on error,
+ * @return 1 if a data packets is ready to be received, -1 on error,
* and 0 on success.
*/
int ff_rtsp_read_reply(AVFormatContext *s, RTSPMessageHeader *reply,
@@ -422,7 +422,7 @@ void ff_rtsp_skip_packet(AVFormatContext *s);
*
* @param s RTSP (de)muxer context
*
- * @returns 0 on success, < 0 on error. Cleans up all allocations done
+ * @return 0 on success, < 0 on error. Cleans up all allocations done
* within the function on error.
*/
int ff_rtsp_connect(AVFormatContext *s);