Commit 5ad24b56 authored by michael's avatar michael

Remove incorrect casts that should have never been there.


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@11824 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 3820a2e6
...@@ -1689,7 +1689,7 @@ static int try_decode_frame(AVStream *st, const uint8_t *data, int size) ...@@ -1689,7 +1689,7 @@ static int try_decode_frame(AVStream *st, const uint8_t *data, int size)
switch(st->codec->codec_type) { switch(st->codec->codec_type) {
case CODEC_TYPE_VIDEO: case CODEC_TYPE_VIDEO:
ret = avcodec_decode_video(st->codec, &picture, ret = avcodec_decode_video(st->codec, &picture,
&got_picture, (uint8_t *)data, size); &got_picture, data, size);
break; break;
case CODEC_TYPE_AUDIO: case CODEC_TYPE_AUDIO:
data_size = FFMAX(size, AVCODEC_MAX_AUDIO_FRAME_SIZE); data_size = FFMAX(size, AVCODEC_MAX_AUDIO_FRAME_SIZE);
...@@ -1697,7 +1697,7 @@ static int try_decode_frame(AVStream *st, const uint8_t *data, int size) ...@@ -1697,7 +1697,7 @@ static int try_decode_frame(AVStream *st, const uint8_t *data, int size)
if (!samples) if (!samples)
goto fail; goto fail;
ret = avcodec_decode_audio2(st->codec, samples, ret = avcodec_decode_audio2(st->codec, samples,
&data_size, (uint8_t *)data, size); &data_size, data, size);
av_free(samples); av_free(samples);
break; break;
default: default:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment