Merge commit 'b72727a5248f1ef02db99b378dce1eb48a46357a'

* commit 'b72727a5248f1ef02db99b378dce1eb48a46357a': lavc: mention that the parser callback never returns an error Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago · 66f379da15
parent 03abf55f25 b72727a524
commit 66f379da15
1 changed files with 2 additions and 0 deletions
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@ -4354,6 +4354,8 @@ typedef struct AVCodecParser {
    int codec_ids[5]; /* several codec IDs are permitted */
    int priv_data_size;
    int (*parser_init)(AVCodecParserContext *s);
+    /* This callback never returns an error, a negative value means that
+     * the frame start was in a previous packet. */
    int (*parser_parse)(AVCodecParserContext *s,
                        AVCodecContext *avctx,
                        const uint8_t **poutbuf, int *poutbuf_size,