[SCM] libav/experimental: We cannot calculate the duration of vorbis packets even if we do know the "minimal" frame_size.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit c924ca78b60fe588364977be8a0f3834bda4fc11
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Wed Jun 25 18:15:04 2008 +0000

    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

diff --git a/libavformat/utils.c b/libavformat/utils.c
index a6dc70e..5329ba5 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;

-- 
Libav/FFmpeg packaging