]> git.sesse.net Git - mlt/commitdiff
Cleanup compile warnings.
authorDan Dennedy <dan@dennedy.org>
Thu, 5 May 2011 07:39:49 +0000 (00:39 -0700)
committerDan Dennedy <dan@dennedy.org>
Thu, 5 May 2011 07:39:49 +0000 (00:39 -0700)
src/modules/avformat/producer_avformat.c

index ee563982ee5715283579fe9740d5b142dcb2319e..454ba4e77f0295e500036a0d9a7ef4a1f9a17ab3 100644 (file)
@@ -1929,7 +1929,7 @@ static int decode_audio( producer_avformat self, int *ignore, AVPacket pkt, int
 
                // Decode the audio
 #if (LIBAVCODEC_VERSION_INT >= ((52<<16)+(26<<8)+0))
-               ret = avcodec_decode_audio3( codec_context, decode_buffer, &data_size, &pkt );
+               ret = avcodec_decode_audio3( codec_context, (int16_t*) decode_buffer, &data_size, &pkt );
 #elif (LIBAVCODEC_VERSION_INT >= ((51<<16)+(29<<8)+0))
                ret = avcodec_decode_audio2( codec_context, decode_buffer, &data_size, ptr, len );
 #else
@@ -1962,7 +1962,7 @@ static int decode_audio( producer_avformat self, int *ignore, AVPacket pkt, int
                                // Copy to audio buffer while resampling
                                uint8_t *source = decode_buffer;
                                uint8_t *dest = &audio_buffer[ audio_used * channels * sizeof_sample ];
-                               audio_used += audio_resample( resample, dest, source, convert_samples );
+                               audio_used += audio_resample( resample, (short*) dest, (short*) source, convert_samples );
                        }
                        else
                        {