Merge commit 'e0d73fda361729d207e51fa2afd8ba6102e58d98'

[ffmpeg] / libavcodec / h264_parser.c

diff --git a/libavcodec/h264_parser.c b/libavcodec/h264_parser.c
index a075bfa987adbf1c34680a6a86c4bcf964ebbeb5..e8243a23f66afeeacf5615f30ccd6e9f84b11c87 100644 (file)
--- a/libavcodec/h264_parser.c
+++ b/libavcodec/h264_parser.c
@@ -99,7 +99,6 @@ static int h264_find_frame_end(H264Context *h, const uint8_t *buf,
                 init_get_bits(&gb, h->parse_history, 8*h->parse_history_count);
                 h->parse_history_count=0;
                 mb= get_ue_golomb_long(&gb);
-                last_mb= h->parse_last_mb;
                 h->parse_last_mb= mb;
                 if (pc->frame_start_found) {
                     if (mb <= last_mb)