Merge commit '9a07c1332cfe092b57b5758f22b686ca58806c60'

[ffmpeg] / libavcodec / parser.c

diff --git a/libavcodec/parser.c b/libavcodec/parser.c
index 127ba8bd3dea4fdd76263f67fef14f0d8edec803..cd1bcbcee2f5e6f690953b77b21ad6ac893110e4 100644 (file)
--- a/libavcodec/parser.c
+++ b/libavcodec/parser.c
@@ -165,11 +165,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,
@@ -215,10 +210,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){