[FFmpeg-cvslog] matroska: improve declaration of video_stereo_* constant tables

[Aurelien Jacobs]

ffmpeg | branch: master | Aurelien Jacobs <aurel at gnuage.org> | Tue May 24 23:34:24 2011 +0200| [09525f7956508c420a5c56c8daee16e05aa3f528] | committer: Aurelien Jacobs

matroska: improve declaration of video_stereo_* constant tables

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=09525f7956508c420a5c56c8daee16e05aa3f528
---

 libavformat/matroska.c |    4 ++--
 libavformat/matroska.h |   10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/libavformat/matroska.c b/libavformat/matroska.c
index fe9b042..52481d7 100644
--- a/libavformat/matroska.c
+++ b/libavformat/matroska.c
@@ -100,7 +100,7 @@ const AVMetadataConv ff_mkv_metadata_conv[] = {
     { 0 }
 };
 
-const char const *matroska_video_stereo_mode[] = {
+const char * const matroska_video_stereo_mode[MATROSKA_VIDEO_STEREO_MODE_COUNT] = {
     "mono",
     "left_right",
     "bottom_top",
@@ -118,7 +118,7 @@ const char const *matroska_video_stereo_mode[] = {
     "block_rl",
 };
 
-const char const *matroska_video_stereo_plane[] = {
+const char * const matroska_video_stereo_plane[MATROSKA_VIDEO_STEREO_PLANE_COUNT] = {
     "left",
     "right",
     "background",
diff --git a/libavformat/matroska.h b/libavformat/matroska.h
index 949195b..32b04c5 100644
--- a/libavformat/matroska.h
+++ b/libavformat/matroska.h
@@ -240,13 +240,13 @@ typedef struct CodecMime{
 /* max. depth in the EBML tree structure */
 #define EBML_MAX_DEPTH 16
 
+#define MATROSKA_VIDEO_STEREO_MODE_COUNT  15
+#define MATROSKA_VIDEO_STEREO_PLANE_COUNT  3
+
 extern const CodecTags ff_mkv_codec_tags[];
 extern const CodecMime ff_mkv_mime_tags[];
 extern const AVMetadataConv ff_mkv_metadata_conv[];
-extern const char const *matroska_video_stereo_mode[];
-extern const char const *matroska_video_stereo_plane[];
-
-#define MATROSKA_VIDEO_STEREO_MODE_COUNT  15
-#define MATROSKA_VIDEO_STEREO_PLANE_COUNT  3
+extern const char * const matroska_video_stereo_mode[MATROSKA_VIDEO_STEREO_MODE_COUNT];
+extern const char * const matroska_video_stereo_plane[MATROSKA_VIDEO_STEREO_PLANE_COUNT];
 
 #endif /* AVFORMAT_MATROSKA_H */