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: Michael Niedermayer <michaelni@gmx.at>

libavcodec/asvenc.c

@@ -182,8 +182,9 @@ 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;
 }