fix ending null entry in table

[ffmpeg] / libavformat / oggparseflac.c

diff --git a/libavformat/oggparseflac.c b/libavformat/oggparseflac.c
index 9ad362830d58ff0b61b82607ddac1e42095702f7..a63e9d2e60b3cce056fbead19dd57b147e8cfcd0 100644 (file)
--- a/libavformat/oggparseflac.c
+++ b/libavformat/oggparseflac.c
@@ -1,6 +1,6 @@
 /*
  *    Copyright (C) 2005  Matthieu CASTET
- * 
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include <stdlib.h>
@@ -45,24 +45,27 @@ flac_header (AVFormatContext * s, int idx)
             return -1;
         skip_bits(&gb, 8 + 16);      /* minor version + header count */
         skip_bits(&gb, 4*8); /* "fLaC" */
-    
+
         /* METADATA_BLOCK_HEADER */
         if (get_bits(&gb, 32) != FLAC_STREAMINFO_SIZE)
             return -1;
 
         skip_bits(&gb, 16*2+24*2);
 
-        st->codec.sample_rate = get_bits_long(&gb, 20);
-        st->codec.channels = get_bits(&gb, 3) + 1;
-    
-        st->codec.codec_type = CODEC_TYPE_AUDIO;
-        st->codec.codec_id = CODEC_ID_FLAC;
+        st->codec->sample_rate = get_bits_long(&gb, 20);
+        st->codec->channels = get_bits(&gb, 3) + 1;
 
-        st->codec.extradata =
+        st->codec->codec_type = CODEC_TYPE_AUDIO;
+        st->codec->codec_id = CODEC_ID_FLAC;
+
+        st->codec->extradata =
             av_malloc(FLAC_STREAMINFO_SIZE + FF_INPUT_BUFFER_PADDING_SIZE);
-        memcpy (st->codec.extradata, os->buf + os->pstart + 5 + 4 + 4 + 4,
+        memcpy (st->codec->extradata, os->buf + os->pstart + 5 + 4 + 4 + 4,
                 FLAC_STREAMINFO_SIZE);
-        st->codec.extradata_size = FLAC_STREAMINFO_SIZE;
+        st->codec->extradata_size = FLAC_STREAMINFO_SIZE;
+
+        st->time_base.num = 1;
+        st->time_base.den = st->codec->sample_rate;
     } else if (mdt == 4) {
         vorbis_comment (s, os->buf + os->pstart + 4, os->psize - 4);
     }