X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=libavcodec%2Fparser.h;h=ea1cae28a2fac40a920c175e3414e807c68fcfd8;hb=51d8725a6e4c7f989d6f0f38b59cb54a2d72846c;hp=024b487bac82aa4d2b49629052e0831261eddd5c;hpb=b24aaabd44d68c6fafbfc476d1b70cc7ff8138ca;p=ffmpeg

diff --git a/libavcodec/parser.h b/libavcodec/parser.h
index 024b487bac8..ea1cae28a2f 100644
--- a/libavcodec/parser.h
+++ b/libavcodec/parser.h
@@ -37,10 +37,13 @@ typedef struct ParseContext{
     uint64_t state64;           ///< contains the last 8 bytes in MSB order
 } ParseContext;
 
-struct MpegEncContext;
-
 #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);