| @@ -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, | ||||
| @@ -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){ | ||||
| @@ -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); | ||||