diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-15 12:04:31 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-15 12:04:31 +0100 |
| commit | 0c7733904e54472fa5bea04b4a7c35ff6fea9890 (patch) | |
| tree | 0f1950c6bae6e403e6625e69fa3febefbd8fd00a /libavcodec | |
| parent | a400edbb6d00c0211de38e4f1b4f593681db91d8 (diff) | |
| parent | bcbdeb318e0828cf00b458885ffa1e1596c85d06 (diff) | |
| download | ffmpeg-0c7733904e54472fa5bea04b4a7c35ff6fea9890.tar.gz | |
Merge commit 'bcbdeb318e0828cf00b458885ffa1e1596c85d06'
* commit 'bcbdeb318e0828cf00b458885ffa1e1596c85d06':
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>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/asvenc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/asvenc.c b/libavcodec/asvenc.c index 2b2080ef6c..f7d1f7013d 100644 --- a/libavcodec/asvenc.c +++ b/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; } |