diff options
author | Benoit Fouet <benoit.fouet@free.fr> | 2010-03-30 15:50:57 +0000 |
---|---|---|
committer | Benoit Fouet <benoit.fouet@free.fr> | 2010-03-30 15:50:57 +0000 |
commit | 32e543f866d9d4b450729e93cd81dacd8c457971 (patch) | |
tree | 3e4271e8f798d25c3868584a04dcb52df3eff83f /libavcodec | |
parent | 3bccd93ac0b7e5dbb4a335257eaee9d8908dad3c (diff) | |
download | ffmpeg-32e543f866d9d4b450729e93cd81dacd8c457971.tar.gz |
Replace @returns by @return.
Originally committed as revision 22729 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
-rw-r--r-- | libavcodec/cavs.c | 2 | ||||
-rw-r--r-- | libavcodec/h264.h | 8 | ||||
-rw-r--r-- | libavcodec/h264_cabac.c | 2 | ||||
-rw-r--r-- | libavcodec/h264enc.c | 2 | ||||
-rw-r--r-- | libavcodec/mpeg4videodec.c | 2 | ||||
-rw-r--r-- | libavcodec/parser.c | 2 | ||||
-rw-r--r-- | libavcodec/wmavoice.c | 6 |
7 files changed, 12 insertions, 12 deletions
diff --git a/libavcodec/cavs.c b/libavcodec/cavs.c index 70677c9586..42335042ab 100644 --- a/libavcodec/cavs.c +++ b/libavcodec/cavs.c @@ -572,7 +572,7 @@ void ff_cavs_init_mb(AVSContext *h) { /** * save predictors for later macroblocks and increase * macroblock address - * @returns 0 if end of frame is reached, 1 otherwise + * @return 0 if end of frame is reached, 1 otherwise */ int ff_cavs_next_mb(AVSContext *h) { int i; diff --git a/libavcodec/h264.h b/libavcodec/h264.h index 965e39d9bd..ba813b66ba 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -623,7 +623,7 @@ int ff_h264_decode_picture_parameter_set(H264Context *h, int bit_length); * @param consumed is the number of bytes used as input * @param length is the length of the array * @param dst_length is the number of decoded bytes FIXME here or a decode rbsp tailing? - * @returns decoded bytes, might be src+1 if no escapes + * @return decoded bytes, might be src+1 if no escapes */ const uint8_t *ff_h264_decode_nal(H264Context *h, const uint8_t *src, int *dst_length, int *consumed, int length); @@ -685,13 +685,13 @@ av_cold void ff_h264_decode_init_vlc(void); /** * decodes a macroblock - * @returns 0 if OK, AC_ERROR / DC_ERROR / MV_ERROR if an error is noticed + * @return 0 if OK, AC_ERROR / DC_ERROR / MV_ERROR if an error is noticed */ int ff_h264_decode_mb_cavlc(H264Context *h); /** * decodes a CABAC coded macroblock - * @returns 0 if OK, AC_ERROR / DC_ERROR / MV_ERROR if an error is noticed + * @return 0 if OK, AC_ERROR / DC_ERROR / MV_ERROR if an error is noticed */ int ff_h264_decode_mb_cabac(H264Context *h); @@ -1165,7 +1165,7 @@ static void fill_decode_caches(H264Context *h, int mb_type){ /** * - * @returns non zero if the loop filter can be skiped + * @return non zero if the loop filter can be skiped */ static int fill_filter_caches(H264Context *h, int mb_type){ MpegEncContext * const s = &h->s; diff --git a/libavcodec/h264_cabac.c b/libavcodec/h264_cabac.c index 755fb48be8..c5e866179b 100644 --- a/libavcodec/h264_cabac.c +++ b/libavcodec/h264_cabac.c @@ -1181,7 +1181,7 @@ static void decode_cabac_residual_nondc( H264Context *h, DCTELEM *block, int cat /** * decodes a macroblock - * @returns 0 if OK, AC_ERROR / DC_ERROR / MV_ERROR if an error is noticed + * @return 0 if OK, AC_ERROR / DC_ERROR / MV_ERROR if an error is noticed */ int ff_h264_decode_mb_cabac(H264Context *h) { MpegEncContext * const s = &h->s; diff --git a/libavcodec/h264enc.c b/libavcodec/h264enc.c index 5693336b55..e90bfb1542 100644 --- a/libavcodec/h264enc.c +++ b/libavcodec/h264enc.c @@ -31,7 +31,7 @@ * @param dest the target buffer, dst+1 == src is allowed as a special case * @param destsize the length of the dst array * @param b2 the data which should be escaped - * @returns pointer to current position in the output buffer or NULL if an error occurred + * @return pointer to current position in the output buffer or NULL if an error occurred */ static uint8_t *h264_write_nal_unit(int nal_ref_idc, int nal_unit_type, uint8_t *dest, int *destsize, PutBitContext *b2) diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c index 7dadf7e99a..baf7809d00 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -435,7 +435,7 @@ int mpeg4_decode_video_packet_header(MpegEncContext *s) /** * gets the average motion vector for a GMC MB. * @param n either 0 for the x component or 1 for y - * @returns the average MV for a GMC MB + * @return the average MV for a GMC MB */ static inline int get_amv(MpegEncContext *s, int n){ int x, y, mb_v, sum, dx, dy, shift; diff --git a/libavcodec/parser.c b/libavcodec/parser.c index 0b007e9ee4..8f5c77afa7 100644 --- a/libavcodec/parser.c +++ b/libavcodec/parser.c @@ -244,7 +244,7 @@ void av_parser_close(AVCodecParserContext *s) /** * combines the (truncated) bitstream to a complete frame - * @returns -1 if no complete frame could be created, AVERROR(ENOMEM) if there was a memory allocation error + * @return -1 if no complete frame could be created, AVERROR(ENOMEM) if there was a memory allocation error */ int ff_combine_frame(ParseContext *pc, int next, const uint8_t **buf, int *buf_size) { diff --git a/libavcodec/wmavoice.c b/libavcodec/wmavoice.c index bdd05ac83e..9b9609f1a2 100644 --- a/libavcodec/wmavoice.c +++ b/libavcodec/wmavoice.c @@ -754,7 +754,7 @@ static void aw_pulse_set1(WMAVoiceContext *s, GetBitContext *gb, * @param block_num current block index * @param block_size amount of entries we want to read from a table * that has 1000 entries - * @returns a (non-)random number in the [0, 1000 - block_size] range. + * @return a (non-)random number in the [0, 1000 - block_size] range. */ static int pRNG(int frame_cntr, int block_num, int block_size) { @@ -1187,7 +1187,7 @@ static void stabilize_lsps(double *lsps, int num) * does not modify the state of the bitreader; it * only uses it to copy the current stream position * @param s WMA Voice decoding context private data - * @returns -1 if unsupported, 1 on not enough bits or 0 if OK. + * @return -1 if unsupported, 1 on not enough bits or 0 if OK. */ static int check_bits_for_superframe(GetBitContext *orig_gb, WMAVoiceContext *s) @@ -1391,7 +1391,7 @@ static int synth_superframe(AVCodecContext *ctx, * decoder). * * @param s WMA Voice decoding context private data - * @returns 1 if not enough bits were available, or 0 on success. + * @return 1 if not enough bits were available, or 0 on success. */ static int parse_packet_header(WMAVoiceContext *s) { |