ogg: calculate the start position once all the headers are parsed

[ffmpeg] / libavformat / id3v1.h

diff --git a/libavformat/id3v1.h b/libavformat/id3v1.h
index b5dcedc5510ab7cd3de455bab8229fbb176efccf..71070736f176b38827d7e2b9bd301ccfe071fb96 100644 (file)
--- a/libavformat/id3v1.h
+++ b/libavformat/id3v1.h
@@ -2,20 +2,20 @@
  * ID3v1 header parser
  * Copyright (c) 2003 Fabrice Bellard
  *
- * This file is part of FFmpeg.
+ * This file is part of Libav.
  *
- * FFmpeg is free software; you can redistribute it and/or
+ * Libav 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
  * version 2.1 of the License, or (at your option) any later version.
  *
- * FFmpeg is distributed in the hope that it will be useful,
+ * Libav is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
+ * License along with Libav; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
@@ -26,12 +26,12 @@
 
 #define ID3v1_TAG_SIZE 128
 
-#define ID3v1_GENRE_MAX 125
+#define ID3v1_GENRE_MAX 147
 
 /**
  * ID3v1 genres
  */
-extern const char *ff_id3v1_genre_str[ID3v1_GENRE_MAX + 1];
+extern const char * const ff_id3v1_genre_str[ID3v1_GENRE_MAX + 1];
 
 /**
  * Read an ID3v1 tag
@@ -39,4 +39,3 @@ extern const char *ff_id3v1_genre_str[ID3v1_GENRE_MAX + 1];
 void ff_id3v1_read(AVFormatContext *s);
 
 #endif /* AVFORMAT_ID3V1_H */
-