Commit bd05d9e4 authored by John Koleszar's avatar John Koleszar
Browse files

vpxdec: report parse errors from webm_guess_framerate()

If this function fails silently, the nestegg context is destroyed and
future nestegg calls will segfault.

Change-Id: Ie6a0ea284ab9ddfa97b1843ef8030a953937c8cd
parent a5397dba
......@@ -542,6 +542,7 @@ webm_guess_framerate(struct input_ctx *input,
*fps_den = tstamp / 1000;
return 0;
fail:
nestegg_destroy(input->nestegg_ctx);
input->nestegg_ctx = NULL;
rewind(input->infile);
return 1;
......@@ -878,7 +879,13 @@ int main(int argc, const char **argv_)
}
if(input.kind == WEBM_FILE)
webm_guess_framerate(&input, &fps_den, &fps_num);
if(webm_guess_framerate(&input, &fps_den, &fps_num))
{
fprintf(stderr, "Failed to guess framerate -- error parsing "
"webm file?\n");
return EXIT_FAILURE;
}
/*Note: We can't output an aspect ratio here because IVF doesn't
store one, and neither does VP8.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment