summaryrefslogtreecommitdiff
path: root/libavcodec/h264_parser.c
diff options
context:
space:
mode:
authorPhilip Langdale <philipl@overt.org>2011-03-28 21:42:02 -0700
committerAnton Khirnov <anton@khirnov.net>2011-06-13 20:51:42 +0200
commita26ce1e2df102ad085cf1a7891722ef64b80ea24 (patch)
treef54cc146735394d40bb2fd62b5aee01f49a11d60 /libavcodec/h264_parser.c
parent8d0786ec6d066f892f29da6593e99e73a7dfd014 (diff)
h264_parser: Fix behaviour when PARSER_FLAG_COMPLETE_FRAMES is set.
Currently, the parser is buggy and only processes the stream extradata when the flag is set. This fixes it to actually inspect the frames. Whitespce will be fixed in a separate change. Signed-off-by: Philip Langdale <philipl@overt.org> Signed-off-by: Anton Khirnov <anton@khirnov.net>
Diffstat (limited to 'libavcodec/h264_parser.c')
-rw-r--r--libavcodec/h264_parser.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264_parser.c b/libavcodec/h264_parser.c
index 621ff02925..a3149534a8 100644
--- a/libavcodec/h264_parser.c
+++ b/libavcodec/h264_parser.c
@@ -270,6 +270,7 @@ static int h264_parse(AVCodecParserContext *s,
assert(pc->last_index + next >= 0 );
ff_h264_find_frame_end(h, &pc->buffer[pc->last_index + next], -next); //update state
}
+ }
parse_nal_units(s, avctx, buf, buf_size);
@@ -285,7 +286,6 @@ static int h264_parse(AVCodecParserContext *s,
if (s->flags & PARSER_FLAG_ONCE) {
s->flags &= PARSER_FLAG_COMPLETE_FRAMES;
}
- }
*poutbuf = buf;
*poutbuf_size = buf_size;