fix merge problems

Change-Id: I6d0763734139d2852896872c80c5e7fa7889945a
This commit is contained in:
Pascal Massimino
2011-04-26 11:02:38 -07:00
parent 8fd42b3a81
commit f7d9e261c5
4 changed files with 6 additions and 11 deletions

View File

@ -327,7 +327,6 @@ int VP8GetHeaders(VP8Decoder* const dec, VP8Io* const io) {
return VP8SetError(dec, VP8_STATUS_BITSTREAM_ERROR,
"cannot parse filter header");
}
status = ParsePartitions(dec, buf, buf_size);
if (status != VP8_STATUS_OK) {
return VP8SetError(dec, status, "cannot parse partitions");