Mercurial > libavcodec.hg
comparison parser.c @ 11556:b94e1810ce4c libavcodec
Replace @returns by @return.
| author | benoit |
|---|---|
| date | Tue, 30 Mar 2010 15:50:57 +0000 |
| parents | 05a510cd1e3b |
| children | 926ad89ae57a |
comparison
equal
deleted
inserted
replaced
| 11555:e603f624b03f | 11556:b94e1810ce4c |
|---|---|
| 242 | 242 |
| 243 /*****************************************************/ | 243 /*****************************************************/ |
| 244 | 244 |
| 245 /** | 245 /** |
| 246 * combines the (truncated) bitstream to a complete frame | 246 * combines the (truncated) bitstream to a complete frame |
| 247 * @returns -1 if no complete frame could be created, AVERROR(ENOMEM) if there was a memory allocation error | 247 * @return -1 if no complete frame could be created, AVERROR(ENOMEM) if there was a memory allocation error |
| 248 */ | 248 */ |
| 249 int ff_combine_frame(ParseContext *pc, int next, const uint8_t **buf, int *buf_size) | 249 int ff_combine_frame(ParseContext *pc, int next, const uint8_t **buf, int *buf_size) |
| 250 { | 250 { |
| 251 #if 0 | 251 #if 0 |
| 252 if(pc->overread){ | 252 if(pc->overread){ |
