ffmpeg | branch: master | Peter Ross <pr...@xvid.org> | Fri Jan 9 10:09:04 2015 +1100| [624384503643f1d3fd2e8f8f9b986ddcf2067a21] | committer: Michael Niedermayer
avformat/aiffdec: improve readability Signed-off-by: Peter Ross <pr...@xvid.org> Signed-off-by: Michael Niedermayer <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=624384503643f1d3fd2e8f8f9b986ddcf2067a21 --- libavformat/aiffdec.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavformat/aiffdec.c b/libavformat/aiffdec.c index 8dbed32..301d90f 100644 --- a/libavformat/aiffdec.c +++ b/libavformat/aiffdec.c @@ -116,12 +116,12 @@ static unsigned int get_aiff_header(AVFormatContext *s, int size, size -= 18; /* get codec id for AIFF-C */ - if (version == AIFF_C_VERSION1 && size >= 4) { + if (size < 4) { + version = AIFF; + } else if (version == AIFF_C_VERSION1) { codec->codec_tag = avio_rl32(pb); codec->codec_id = ff_codec_get_id(ff_codec_aiff_tags, codec->codec_tag); size -= 4; - } else { - version = AIFF; } if (version != AIFF_C_VERSION1 || codec->codec_id == AV_CODEC_ID_PCM_S16BE) { _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
