diff options
| author | Diego Biurrun <diego@biurrun.de> | 2012-11-02 12:04:16 +0100 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2012-11-02 16:44:23 +0100 |
| commit | 9a07c1332cfe092b57b5758f22b686ca58806c60 (patch) | |
| tree | b63f66a6e2a255721ad56de834ba1c7b60ace043 /libavcodec | |
| parent | 85f67c4865d8014ded2aaa64b3cba6e2970342d7 (diff) | |
| download | ffmpeg-9a07c1332cfe092b57b5758f22b686ca58806c60.tar.gz | |
parser: Move Doxygen documentation to the header files
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/avcodec.h | 4 | ||||
| -rw-r--r-- | libavcodec/parser.c | 9 | ||||
| -rw-r--r-- | libavcodec/parser.h | 5 |
3 files changed, 9 insertions, 9 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 43f7c87b23..d5968f9e55 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -3890,6 +3890,10 @@ int av_parser_parse2(AVCodecParserContext *s, int64_t pts, int64_t dts, int64_t pos); +/** + * @return 0 if the output buffer is a subset of the input, 1 if it is allocated and must be freed + * @deprecated use AVBitstreamFilter + */ int av_parser_change(AVCodecParserContext *s, AVCodecContext *avctx, uint8_t **poutbuf, int *poutbuf_size, diff --git a/libavcodec/parser.c b/libavcodec/parser.c index 03f327efd0..7ace766eb9 100644 --- a/libavcodec/parser.c +++ b/libavcodec/parser.c @@ -167,11 +167,6 @@ int av_parser_parse2(AVCodecParserContext *s, return index; } -/** - * - * @return 0 if the output buffer is a subset of the input, 1 if it is allocated and must be freed - * @deprecated use AVBitstreamFilter - */ int av_parser_change(AVCodecParserContext *s, AVCodecContext *avctx, uint8_t **poutbuf, int *poutbuf_size, @@ -217,10 +212,6 @@ void av_parser_close(AVCodecParserContext *s) /*****************************************************/ -/** - * Combine the (truncated) bitstream to a complete frame. - * @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) { if(pc->overread){ diff --git a/libavcodec/parser.h b/libavcodec/parser.h index 1d029e319e..ea1cae28a2 100644 --- a/libavcodec/parser.h +++ b/libavcodec/parser.h @@ -39,6 +39,11 @@ typedef struct ParseContext{ #define END_NOT_FOUND (-100) +/** + * Combine the (truncated) bitstream to a complete frame. + * @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); int ff_mpeg4video_split(AVCodecContext *avctx, const uint8_t *buf, int buf_size); |