generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

parser: Move Doxygen documentation to the header files

Browse Source
This commit is contained in:
Diego Biurrun 2012-11-02 12:04:16 +01:00
parent 85f67c4865
commit 9a07c1332c
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/avcodec.h
View File

@ -3890,6 +3890,10 @@ int av_parser_parse2(AVCodecParserContext *s,
int64_t pts, int64_t dts, int64_t pts, int64_t dts,
int64_t pos); 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, int av_parser_change(AVCodecParserContext *s,
AVCodecContext *avctx, AVCodecContext *avctx,
uint8_t **poutbuf, int *poutbuf_size, uint8_t **poutbuf, int *poutbuf_size,

9
libavcodec/parser.c
View File

@ -167,11 +167,6 @@ int av_parser_parse2(AVCodecParserContext *s,
return index; 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, int av_parser_change(AVCodecParserContext *s,
AVCodecContext *avctx, AVCodecContext *avctx,
uint8_t **poutbuf, int *poutbuf_size, 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) int ff_combine_frame(ParseContext *pc, int next, const uint8_t **buf, int *buf_size)
{ {
if(pc->overread){ if(pc->overread){

5
libavcodec/parser.h
View File

@ -39,6 +39,11 @@ typedef struct ParseContext{
#define END_NOT_FOUND (-100) #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_combine_frame(ParseContext *pc, int next, const uint8_t **buf, int *buf_size);
int ff_mpeg4video_split(AVCodecContext *avctx, const uint8_t *buf, int ff_mpeg4video_split(AVCodecContext *avctx, const uint8_t *buf,
int buf_size); int buf_size);