mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-12-11 01:25:25 +00:00
Merge commit 'b72727a5248f1ef02db99b378dce1eb48a46357a'
* commit 'b72727a5248f1ef02db99b378dce1eb48a46357a': lavc: mention that the parser callback never returns an error Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
66f379da15
@ -4354,6 +4354,8 @@ typedef struct AVCodecParser {
|
|||||||
int codec_ids[5]; /* several codec IDs are permitted */
|
int codec_ids[5]; /* several codec IDs are permitted */
|
||||||
int priv_data_size;
|
int priv_data_size;
|
||||||
int (*parser_init)(AVCodecParserContext *s);
|
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,
|
int (*parser_parse)(AVCodecParserContext *s,
|
||||||
AVCodecContext *avctx,
|
AVCodecContext *avctx,
|
||||||
const uint8_t **poutbuf, int *poutbuf_size,
|
const uint8_t **poutbuf, int *poutbuf_size,
|
||||||
|
Loading…
Reference in New Issue
Block a user