diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-06 00:51:10 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-06 00:52:42 +0100 |
| commit | 66f379da15cedab61ece10e2220f2492450fe057 (patch) | |
| tree | 4299831e8600f3653c34d403cc3674a3b2b6c081 /libavcodec/avcodec.h | |
| parent | 03abf55f252945c70f4a79eaf4d609cee4d98710 (diff) | |
| parent | b72727a5248f1ef02db99b378dce1eb48a46357a (diff) | |
Merge commit 'b72727a5248f1ef02db99b378dce1eb48a46357a'
* commit 'b72727a5248f1ef02db99b378dce1eb48a46357a':
lavc: mention that the parser callback never returns an error
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/avcodec.h')
| -rw-r--r-- | libavcodec/avcodec.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index dabae1b2bd..75ef840e16 100644 --- 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, |