summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2016-03-28 10:56:51 +0200
committerAnton Khirnov <anton@khirnov.net>2016-04-24 10:06:24 +0200
commit113aeee6aed35cb786a9f6d69b0cb210f498b9da (patch)
tree9c9d6f365150db01e9e899ce0a0a20569bd641b5 /libavcodec
parent3176217c60ca7828712985092d9102d331ea4f3d (diff)
h264_parser: move the H264DSPContext to the parser context
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/h264_parser.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/h264_parser.c b/libavcodec/h264_parser.c
index cd37d31fbd..d62eb73515 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;
}