diff options
author | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2009-04-13 03:32:02 +0000 |
---|---|---|
committer | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2009-04-13 03:32:02 +0000 |
commit | e472ea34c468e69014c9eddfc598cd499266b365 (patch) | |
tree | 8f4e361ed376d6f05e0b50a8017c9080b9209cfb /libavformat/utils.c | |
parent | 8fa0ae060b759d00c8d8f4070b36c16b3dbf0d8a (diff) | |
download | ffmpeg-e472ea34c468e69014c9eddfc598cd499266b365.tar.gz |
reindent
Originally committed as revision 18480 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/utils.c')
-rw-r--r-- | libavformat/utils.c | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index 0dec40f9c3..df45f9efcc 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -1848,34 +1848,34 @@ static int try_decode_frame(AVStream *st, AVPacket *avpkt) int got_picture, data_size, ret=0; AVFrame picture; - if(!st->codec->codec){ - codec = avcodec_find_decoder(st->codec->codec_id); - if (!codec) - return -1; - ret = avcodec_open(st->codec, codec); - if (ret < 0) - return ret; - } + if(!st->codec->codec){ + codec = avcodec_find_decoder(st->codec->codec_id); + if (!codec) + return -1; + ret = avcodec_open(st->codec, codec); + if (ret < 0) + return ret; + } - if(!has_codec_parameters(st->codec)){ - switch(st->codec->codec_type) { - case CODEC_TYPE_VIDEO: - ret = avcodec_decode_video2(st->codec, &picture, - &got_picture, avpkt); - break; - case CODEC_TYPE_AUDIO: - data_size = FFMAX(avpkt->size, AVCODEC_MAX_AUDIO_FRAME_SIZE); - samples = av_malloc(data_size); - if (!samples) - goto fail; - ret = avcodec_decode_audio3(st->codec, samples, - &data_size, avpkt); - av_free(samples); - break; - default: - break; + if(!has_codec_parameters(st->codec)){ + switch(st->codec->codec_type) { + case CODEC_TYPE_VIDEO: + ret = avcodec_decode_video2(st->codec, &picture, + &got_picture, avpkt); + break; + case CODEC_TYPE_AUDIO: + data_size = FFMAX(avpkt->size, AVCODEC_MAX_AUDIO_FRAME_SIZE); + samples = av_malloc(data_size); + if (!samples) + goto fail; + ret = avcodec_decode_audio3(st->codec, samples, + &data_size, avpkt); + av_free(samples); + break; + default: + break; + } } - } fail: return ret; } |