X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fparser.h;h=ea1cae28a2fac40a920c175e3414e807c68fcfd8;hb=9a07c1332cfe092b57b5758f22b686ca58806c60;hp=1d029e319e3ba18ecdc7bb77e635b72c33dbfe5a;hpb=85f67c4865d8014ded2aaa64b3cba6e2970342d7;p=ffmpeg

diff --git a/libavcodec/parser.h b/libavcodec/parser.h
index 1d029e319e3..ea1cae28a2f 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);