[FFmpeg-cvslog] Merge commit 'a86ef80494d759807a5ef8dd12838f0690092e37'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <clement at stupeflix.com> | Fri Jun 24 11:10:35 2016 +0200| [1ca383c8d4e8f48d12b7ab0ba8355534f33f5087] | committer: Clément Bœsch

Merge commit 'a86ef80494d759807a5ef8dd12838f0690092e37'

* commit 'a86ef80494d759807a5ef8dd12838f0690092e37':
  blowfish-test: Return different values for different errors

Merged-by: Clément Bœsch <clement at stupeflix.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1ca383c8d4e8f48d12b7ab0ba8355534f33f5087
---

 libavutil/tests/blowfish.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavutil/tests/blowfish.c b/libavutil/tests/blowfish.c
index 2c2e004..0f76a85 100644
--- a/libavutil/tests/blowfish.c
+++ b/libavutil/tests/blowfish.c
@@ -174,13 +174,13 @@ int main(void)
         av_blowfish_crypt_ecb(&ctx, &tmptext_l[i], &tmptext_r[i], 0);
         if (tmptext_l[i] != ciphertext_l[i] || tmptext_r[i] != ciphertext_r[i]) {
             printf("Test encryption failed.\n");
-            return 1;
+            return 2;
         }
 
         av_blowfish_crypt_ecb(&ctx, &tmptext_l[i], &tmptext_r[i], 1);
         if (tmptext_l[i] != plaintext_l[i] || tmptext_r[i] != plaintext_r[i]) {
             printf("Test decryption failed.\n");
-            return 1;
+            return 3;
         }
     }
     printf("Test encryption/decryption success.\n");


======================================================================