summaryrefslogtreecommitdiff
path: root/libavcodec/parser.h
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2012-11-02 12:04:16 +0100
committerDiego Biurrun <diego@biurrun.de>2012-11-02 16:44:23 +0100
commit9a07c1332cfe092b57b5758f22b686ca58806c60 (patch)
treeb63f66a6e2a255721ad56de834ba1c7b60ace043 /libavcodec/parser.h
parent85f67c4865d8014ded2aaa64b3cba6e2970342d7 (diff)
parser: Move Doxygen documentation to the header files
Diffstat (limited to 'libavcodec/parser.h')
-rw-r--r--libavcodec/parser.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/parser.h b/libavcodec/parser.h
index 1d029e319e..ea1cae28a2 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);