Merge pull request #3344 from admshao/fix-compiling-warnings

Fix compiling warnings

UI/forms/source-toolbar/device-select-toolbar.ui

@@ -57,7 +57,7 @@
       <string notr="true"/>
      </property>
      <property name="sizeAdjustPolicy">
-      <enum>QComboBox::AdjustToMinimumContentsLength</enum>
+      <enum>QComboBox::AdjustToMinimumContentsLengthWithIcon</enum>
      </property>
     </widget>
    </item>

UI/forms/source-toolbar/game-capture-toolbar.ui

@@ -77,7 +77,7 @@
       <string notr="true"/>
      </property>
      <property name="sizeAdjustPolicy">
-      <enum>QComboBox::AdjustToMinimumContentsLength</enum>
+      <enum>QComboBox::AdjustToMinimumContentsLengthWithIcon</enum>
      </property>
     </widget>
    </item>

plugins/obs-outputs/flv-mux.c

@@ -361,7 +361,7 @@ static void flv_build_additional_meta_data(uint8_t **data, size_t *size)
 void flv_additional_meta_data(obs_output_t *context, uint8_t **data,
 			      size_t *size)
 {
-	obs_encoder_t *aencoder = obs_output_get_audio_encoder(context, 1);
+	UNUSED_PARAMETER(context);
 	struct array_output_data out;
 	struct serializer s;
 	uint8_t *meta_data = NULL;
@@ -414,6 +414,7 @@ static void flv_build_additional_audio(uint8_t **data, size_t *size,
 				       struct encoder_packet *packet,
 				       bool is_header, size_t index)
 {
+	UNUSED_PARAMETER(index);
 	struct array_output_data out;
 	struct serializer s;
 

plugins/obs-outputs/librtmp/rtmp.c

@@ -5277,13 +5277,11 @@ fail:
     return total;
 }
 
-static const AVal av_setDataFrame = AVC("@setDataFrame");
-
 int
 RTMP_Write(RTMP *r, const char *buf, int size, int streamIdx)
 {
     RTMPPacket *pkt = &r->m_write;
-    char *pend, *enc;
+    char *enc;
     int s2 = size, ret, num;
 
     pkt->m_nChannel = 0x04;	/* source channel */
@@ -5331,7 +5329,6 @@ RTMP_Write(RTMP *r, const char *buf, int size, int streamIdx)
                 return FALSE;
             }
             enc = pkt->m_body;
-            pend = enc + pkt->m_nBodySize;
         }
         else
         {

plugins/obs-outputs/rtmp-stream.c

@@ -777,7 +777,6 @@ static void adjust_sndbuf_size(struct rtmp_stream *stream, int new_size)
 static int init_send(struct rtmp_stream *stream)
 {
 	int ret;
-	size_t idx = 0;
 	obs_output_t *context = stream->output;
 
 #if defined(_WIN32)

plugins/obs-x264/obs-x264.c

@@ -565,7 +565,7 @@ static void log_custom_options(struct obs_x264 *obsx264,
 					     options->options[i].name,
 					     options->options[i].value);
 		assert(chars_written >= 0);
-		assert(chars_written <= remaining_buffer_size);
+		assert((size_t)chars_written <= remaining_buffer_size);
 		p += chars_written;
 		remaining_buffer_size -= chars_written;
 	}