X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fparser.h;h=ea1cae28a2fac40a920c175e3414e807c68fcfd8;hb=136034d86b5cb1819a2c3e6ecdfeb05dcba7140d;hp=1e85ae40517191882932224d32f61de754798451;hpb=2912e87a6c9264d556734e2bf94a99c64cf9b102;p=ffmpeg diff --git a/libavcodec/parser.h b/libavcodec/parser.h index 1e85ae40517..ea1cae28a2f 100644 --- a/libavcodec/parser.h +++ b/libavcodec/parser.h @@ -37,28 +37,17 @@ typedef struct ParseContext{ uint64_t state64; ///< contains the last 8 bytes in MSB order } ParseContext; -struct MpegEncContext; - -typedef struct ParseContext1{ - ParseContext pc; -/* XXX/FIXME PC1 vs. PC */ - /* MPEG-2-specific */ - AVRational frame_rate; - int progressive_sequence; - int width, height; - - /* XXX: suppress that, needed by MPEG-4 */ - struct MpegEncContext *enc; - int first_picture; -} ParseContext1; - #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); void ff_parse_close(AVCodecParserContext *s); -void ff_parse1_close(AVCodecParserContext *s); /** * Fetch timestamps for a specific byte within the current access unit.