[Bf-blender-cvs] [631d5026c7b] master: Cleanup: Simplification of `BKE_ffmpeg_alpha_channel_is_supported()`

[Sybren A. Stüvel]

Commit: 631d5026c7bb34320c5d9b60afa5bc44b40fc5e4
Author: Sybren A. Stüvel
Date:   Wed Jul 31 11:15:14 2019 +0200
Branches: master
https://developer.blender.org/rB631d5026c7bb34320c5d9b60afa5bc44b40fc5e4

Cleanup: Simplification of `BKE_ffmpeg_alpha_channel_is_supported()`

Simplified `BKE_ffmpeg_alpha_channel_is_supported()` to use `ELEM()`
instead of a row consecutive `if`-statements.

No functional changes.

Reviewed By: brecht

Differential Revision: https://developer.blender.org/D5156

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

M	source/blender/blenkernel/intern/writeffmpeg.c

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

diff --git a/source/blender/blenkernel/intern/writeffmpeg.c b/source/blender/blenkernel/intern/writeffmpeg.c
index f3336adda30..0d4182ff24d 100644
--- a/source/blender/blenkernel/intern/writeffmpeg.c
+++ b/source/blender/blenkernel/intern/writeffmpeg.c
@@ -1835,26 +1835,13 @@ void BKE_ffmpeg_codec_settings_verify(RenderData *rd)
 bool BKE_ffmpeg_alpha_channel_is_supported(RenderData *rd)
 {
   int codec = rd->ffcodecdata.codec;
-
-  if (codec == AV_CODEC_ID_QTRLE) {
-    return true;
-  }
-
-  if (codec == AV_CODEC_ID_PNG) {
-    return true;
-  }
-
-  if (codec == AV_CODEC_ID_HUFFYUV) {
-    return true;
-  }
-
+  return ELEM(codec,
+              AV_CODEC_ID_QTRLE,
+              AV_CODEC_ID_PNG,
 #  ifdef FFMPEG_FFV1_ALPHA_SUPPORTED
-  if (codec == AV_CODEC_ID_FFV1) {
-    return true;
-  }
+              AV_CODEC_ID_FFV1,
 #  endif
-
-  return false;
+              AV_CODEC_ID_HUFFYUV);
 }
 
 void *BKE_ffmpeg_context_create(void)