aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/h264_parser.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-07-31 16:25:21 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-07-31 16:39:04 +0200
commit0782fb6bcb32fe3ab956a99af4cc472ff81da0c2 (patch)
treeb235bddafccf388eff7e468f0ac857693e947790 /libavcodec/h264_parser.c
parentbf428bb3145c4f0eef32f8ef00de0ee222b3e414 (diff)
downloadffmpeg-0782fb6bcb32fe3ab956a99af4cc472ff81da0c2.tar.gz
libavcodec/h264_parser: Increase parse_history, fix huge resolutions
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264_parser.c')
-rw-r--r--libavcodec/h264_parser.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/h264_parser.c b/libavcodec/h264_parser.c
index ea0ab98034..a075bfa987 100644
--- a/libavcodec/h264_parser.c
+++ b/libavcodec/h264_parser.c
@@ -92,7 +92,7 @@ static int h264_find_frame_end(H264Context *h, const uint8_t *buf,
state = 7;
} else {
h->parse_history[h->parse_history_count++]= buf[i];
- if (h->parse_history_count>3) {
+ if (h->parse_history_count>5) {
unsigned int mb, last_mb= h->parse_last_mb;
GetBitContext gb;
@@ -120,7 +120,7 @@ found:
pc->frame_start_found = 0;
if (h->is_avc)
return next_avc;
- return i - (state & 5) - 3 * (state > 7);
+ return i - (state & 5) - 5 * (state > 7);
}
static int scan_mmco_reset(AVCodecParserContext *s)