aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2008-06-25 18:15:04 +0000
committerMichael Niedermayer <michaelni@gmx.at>2008-06-25 18:15:04 +0000
commitc924ca78b60fe588364977be8a0f3834bda4fc11 (patch)
treeaef10d648e51844a956a4abd71d8e9cbb3a5b868
parentff558537f0f82b3ce01715e62f0351794b3ddd7f (diff)
downloadffmpeg-c924ca78b60fe588364977be8a0f3834bda4fc11.tar.gz
We cannot calculate the duration of vorbis packets even if we do know the
"minimal" frame_size. Originally committed as revision 13969 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavformat/utils.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c
index a6dc70e804..5329ba55ca 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -538,12 +538,12 @@ static int get_audio_frame_size(AVCodecContext *enc, int size)
{
int frame_size;
+ if(enc->codec_id == CODEC_ID_VORBIS)
+ return -1;
+
if (enc->frame_size <= 1) {
int bits_per_sample = av_get_bits_per_sample(enc->codec_id);
- if(enc->codec_id == CODEC_ID_VORBIS)
- return -1;
-
if (bits_per_sample) {
if (enc->channels == 0)
return -1;