Module: libav Branch: master Commit: 113aeee6aed35cb786a9f6d69b0cb210f498b9da
Author: Anton Khirnov <[email protected]> Committer: Anton Khirnov <[email protected]> Date: Mon Mar 28 10:56:51 2016 +0200 h264_parser: move the H264DSPContext to the parser context --- libavcodec/h264_parser.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/h264_parser.c b/libavcodec/h264_parser.c index cd37d31..d62eb73 100644 --- a/libavcodec/h264_parser.c +++ b/libavcodec/h264_parser.c @@ -46,6 +46,7 @@ typedef struct H264ParseContext { H264Context h; ParseContext pc; H264ParamSets ps; + H264DSPContext h264dsp; int got_first; } H264ParseContext; @@ -53,7 +54,6 @@ typedef struct H264ParseContext { static int h264_find_frame_end(H264ParseContext *p, const uint8_t *buf, int buf_size) { - H264Context *h = &p->h; int i; uint32_t state; ParseContext *pc = &p->pc; @@ -64,7 +64,7 @@ static int h264_find_frame_end(H264ParseContext *p, const uint8_t *buf, for (i = 0; i < buf_size; i++) { if (state == 7) { - i += h->h264dsp.startcode_find_candidate(buf + i, buf_size - i); + i += p->h264dsp.startcode_find_candidate(buf + i, buf_size - i); if (i < buf_size) state = 2; } else if (state <= 2) { @@ -597,7 +597,7 @@ static av_cold int init(AVCodecParserContext *s) h->nb_slice_ctx = 1; h->slice_context_count = 1; - ff_h264dsp_init(&h->h264dsp, 8, 1); + ff_h264dsp_init(&p->h264dsp, 8, 1); return 0; } _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
