qsv{dec,enc}: always use an internal mfxFrameSurface1

[ffmpeg] / libavcodec / wma_common.c

diff --git a/libavcodec/wma_common.c b/libavcodec/wma_common.c
index 6ba5337f6a5fe8b94be2a3741f93ba6d1c6391cb..cf76f5cf52eb8031b6debbb6da666b26f8b98c63 100644 (file)
--- a/libavcodec/wma_common.c
+++ b/libavcodec/wma_common.c
@@ -19,6 +19,7 @@
  */
 
 #include "libavutil/attributes.h"
+
 #include "wma_common.h"
 
 /**
@@ -28,34 +29,30 @@
  *@param decode_flags codec compression features
  *@return log2 of the number of output samples per frame
  */
-int av_cold ff_wma_get_frame_len_bits(int sample_rate, int version,
+av_cold int ff_wma_get_frame_len_bits(int sample_rate, int version,
                                       unsigned int decode_flags)
 {
-
     int frame_len_bits;
 
-    if (sample_rate <= 16000) {
+    if (sample_rate <= 16000)
         frame_len_bits = 9;
-    } else if (sample_rate <= 22050 ||
-             (sample_rate <= 32000 && version == 1)) {
+    else if (sample_rate <= 22050 || (sample_rate <= 32000 && version == 1))
         frame_len_bits = 10;
-    } else if (sample_rate <= 48000 || version < 3) {
+    else if (sample_rate <= 48000 || version < 3)
         frame_len_bits = 11;
-    } else if (sample_rate <= 96000) {
+    else if (sample_rate <= 96000)
         frame_len_bits = 12;
-    } else {
+    else
         frame_len_bits = 13;
-    }
 
     if (version == 3) {
         int tmp = decode_flags & 0x6;
-        if (tmp == 0x2) {
+        if (tmp == 0x2)
             ++frame_len_bits;
-        } else if (tmp == 0x4) {
+        else if (tmp == 0x4)
             --frame_len_bits;
-        } else if (tmp == 0x6) {
+        else if (tmp == 0x6)
             frame_len_bits -= 2;
-        }
     }
 
     return frame_len_bits;