Index: media/filters/ffmpeg_audio_decoder.cc |
diff --git a/media/filters/ffmpeg_audio_decoder.cc b/media/filters/ffmpeg_audio_decoder.cc |
index 2ad55cdbba94d4344e4b2ce7ace0e9da91467b7c..a81f2b30c21fd16570e23a8b6b92edecef9cd73e 100644 |
--- a/media/filters/ffmpeg_audio_decoder.cc |
+++ b/media/filters/ffmpeg_audio_decoder.cc |
@@ -42,7 +42,7 @@ static inline int DetermineChannels(AVFrame* frame) { |
// Called by FFmpeg's allocation routine to free a buffer. |opaque| is the |
// AudioBuffer allocated, so unref it. |
-static void ReleaseAudioBufferImpl(void* opaque, uint8* data) { |
+static void ReleaseAudioBufferImpl(void* opaque, uint8_t* data) { |
scoped_refptr<AudioBuffer> buffer; |
buffer.swap(reinterpret_cast<AudioBuffer**>(&opaque)); |
} |
@@ -108,7 +108,7 @@ static int GetAudioBuffer(struct AVCodecContext* s, AVFrame* frame, int flags) { |
} else { |
// There are more channels than can fit into data[], so allocate |
// extended_data[] and fill appropriately. |
- frame->extended_data = static_cast<uint8**>( |
+ frame->extended_data = static_cast<uint8_t**>( |
av_malloc(number_of_planes * sizeof(*frame->extended_data))); |
int i = 0; |
for (; i < AV_NUM_DATA_POINTERS; ++i) |
@@ -251,7 +251,7 @@ bool FFmpegAudioDecoder::FFmpegDecode( |
packet.data = NULL; |
packet.size = 0; |
} else { |
- packet.data = const_cast<uint8*>(buffer->data()); |
+ packet.data = const_cast<uint8_t*>(buffer->data()); |
packet.size = buffer->data_size(); |
} |