lavc/x264: Use FF_CODEC_CAP_INIT_THREADSAFE if x264 is new.

[ffmpeg] / libavcodec / ac3enc.c

diff --git a/libavcodec/ac3enc.c b/libavcodec/ac3enc.c
index 636ca720504508e868535cf3f212501fefa2d4e5..76872a8fe05f82fb3cb884b9a0d33e3d6942aa30 100644 (file)
--- a/libavcodec/ac3enc.c
+++ b/libavcodec/ac3enc.c
@@ -652,7 +652,7 @@ void ff_ac3_process_exponents(AC3EncodeContext *s)
  */
 static void count_frame_bits_fixed(AC3EncodeContext *s)
 {
-    static const int frame_bits_inc[8] = { 0, 0, 2, 2, 2, 4, 2, 4 };
+    static const uint8_t frame_bits_inc[8] = { 0, 0, 2, 2, 2, 4, 2, 4 };
     int blk;
     int frame_bits;
 
@@ -1065,7 +1065,7 @@ static int bit_alloc(AC3EncodeContext *s, int snr_offset)
 {
     int blk, ch;
 
-    snr_offset = (snr_offset - 240) << 2;
+    snr_offset = (snr_offset - 240) * 4;
 
     reset_block_bap(s);
     for (blk = 0; blk < s->num_blocks; blk++) {
@@ -1800,7 +1800,7 @@ static int validate_float_option(float v, const float *v_list, int v_list_size)
             break;
     }
     if (i == v_list_size)
-        return -1;
+        return AVERROR(EINVAL);
 
     return i;
 }