[FFmpeg-cvslog] r18408 - trunk/libavformat/utils.c
stefano
subversion
Fri Apr 10 13:03:06 CEST 2009
Author: stefano
Date: Fri Apr 10 13:03:06 2009
New Revision: 18408
Log:
Make try_decode_frame() use the new avcodec_decode_* API.
Patch by Thilo Borgmann thilo.borgmann AT g00glemail dot com.
Modified:
trunk/libavformat/utils.c
Modified: trunk/libavformat/utils.c
==============================================================================
--- trunk/libavformat/utils.c Fri Apr 10 09:17:30 2009 (r18407)
+++ trunk/libavformat/utils.c Fri Apr 10 13:03:06 2009 (r18408)
@@ -1841,7 +1841,7 @@ static int has_codec_parameters(AVCodecC
return enc->codec_id != CODEC_ID_NONE && val != 0;
}
-static int try_decode_frame(AVStream *st, const uint8_t *data, int size)
+static int try_decode_frame(AVStream *st, AVPacket *avpkt)
{
int16_t *samples;
AVCodec *codec;
@@ -1860,16 +1860,16 @@ static int try_decode_frame(AVStream *st
if(!has_codec_parameters(st->codec)){
switch(st->codec->codec_type) {
case CODEC_TYPE_VIDEO:
- ret = avcodec_decode_video(st->codec, &picture,
- &got_picture, data, size);
+ ret = avcodec_decode_video2(st->codec, &picture,
+ &got_picture, avpkt);
break;
case CODEC_TYPE_AUDIO:
- data_size = FFMAX(size, AVCODEC_MAX_AUDIO_FRAME_SIZE);
+ data_size = FFMAX(avpkt->size, AVCODEC_MAX_AUDIO_FRAME_SIZE);
samples = av_malloc(data_size);
if (!samples)
goto fail;
- ret = avcodec_decode_audio2(st->codec, samples,
- &data_size, data, size);
+ ret = avcodec_decode_audio3(st->codec, samples,
+ &data_size, avpkt);
av_free(samples);
break;
default:
@@ -2144,7 +2144,7 @@ int av_find_stream_info(AVFormatContext
st->codec->codec_id == CODEC_ID_PPM ||
st->codec->codec_id == CODEC_ID_SHORTEN ||
(st->codec->codec_id == CODEC_ID_MPEG4 && !st->need_parsing))*/)
- try_decode_frame(st, pkt->data, pkt->size);
+ try_decode_frame(st, pkt);
count++;
}
More information about the ffmpeg-cvslog
mailing list