Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88'

[ffmpeg] / libavcodec / parser.h

diff --git a/libavcodec/parser.h b/libavcodec/parser.h
index 69f1064fb739576a224360b80d1333e71f683eca..7fe0e115b1dcdce69fafb02c32db2e656ed62622 100644 (file)
--- 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);