Commit 0c773390 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'bcbdeb31'

* commit 'bcbdeb31':
  asvenc: Forward the error instead of asserting on it

Conflicts:
	libavcodec/asvenc.c

Not merged, conditions which are impossible should be checked by assert*()
adding impossible to be true error checks has the potential to confuse
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents a400edbb bcbdeb31
......@@ -182,9 +182,10 @@ static inline int encode_mb(ASV1Context *a, int16_t block[6][64])
for (i = 0; i < 6; i++)
asv1_encode_block(a, block[i]);
} else {
for (i = 0; i < 6; i++)
for (i = 0; i < 6; i++) {
asv2_encode_block(a, block[i]);
}
}
return 0;
}
......
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