# HG changeset patch
# User reimar
# Date 1219599463 0
# Node ID 6c71b789c69e69c504e1e364d03eb5be51d46671
# Parent  93d4898d9b6ebd1b8cc61718863cacca78c32954
Add ff_ prefix to ogg_codec_t structs

diff -r 93d4898d9b6e -r 6c71b789c69e oggdec.c
--- a/oggdec.c	Sun Aug 24 17:24:34 2008 +0000
+++ b/oggdec.c	Sun Aug 24 17:37:43 2008 +0000
@@ -38,15 +38,15 @@
 #define DECODER_BUFFER_SIZE MAX_PAGE_SIZE
 
 static const ogg_codec_t * const ogg_codecs[] = {
-    &speex_codec,
-    &vorbis_codec,
-    &theora_codec,
-    &flac_codec,
-    &old_flac_codec,
-    &ogm_video_codec,
-    &ogm_audio_codec,
-    &ogm_text_codec,
-    &ogm_old_codec,
+    &ff_speex_codec,
+    &ff_vorbis_codec,
+    &ff_theora_codec,
+    &ff_flac_codec,
+    &ff_old_flac_codec,
+    &ff_ogm_video_codec,
+    &ff_ogm_audio_codec,
+    &ff_ogm_text_codec,
+    &ff_ogm_old_codec,
     NULL
 };
 
diff -r 93d4898d9b6e -r 6c71b789c69e oggdec.h
--- a/oggdec.h	Sun Aug 24 17:24:34 2008 +0000
+++ b/oggdec.h	Sun Aug 24 17:37:43 2008 +0000
@@ -75,15 +75,15 @@
 #define OGG_FLAG_BOS  2
 #define OGG_FLAG_EOS  4
 
-extern const ogg_codec_t flac_codec;
-extern const ogg_codec_t ogm_audio_codec;
-extern const ogg_codec_t ogm_old_codec;
-extern const ogg_codec_t ogm_text_codec;
-extern const ogg_codec_t ogm_video_codec;
-extern const ogg_codec_t old_flac_codec;
-extern const ogg_codec_t speex_codec;
-extern const ogg_codec_t theora_codec;
-extern const ogg_codec_t vorbis_codec;
+extern const ogg_codec_t ff_flac_codec;
+extern const ogg_codec_t ff_ogm_audio_codec;
+extern const ogg_codec_t ff_ogm_old_codec;
+extern const ogg_codec_t ff_ogm_text_codec;
+extern const ogg_codec_t ff_ogm_video_codec;
+extern const ogg_codec_t ff_old_flac_codec;
+extern const ogg_codec_t ff_speex_codec;
+extern const ogg_codec_t ff_theora_codec;
+extern const ogg_codec_t ff_vorbis_codec;
 
 extern int vorbis_comment(AVFormatContext *ms, uint8_t *buf, int size);
 
diff -r 93d4898d9b6e -r 6c71b789c69e oggparseflac.c
--- a/oggparseflac.c	Sun Aug 24 17:24:34 2008 +0000
+++ b/oggparseflac.c	Sun Aug 24 17:37:43 2008 +0000
@@ -85,13 +85,13 @@
     return 0;
 }
 
-const ogg_codec_t flac_codec = {
+const ogg_codec_t ff_flac_codec = {
     .magic = "\177FLAC",
     .magicsize = 5,
     .header = flac_header
 };
 
-const ogg_codec_t old_flac_codec = {
+const ogg_codec_t ff_old_flac_codec = {
     .magic = "fLaC",
     .magicsize = 4,
     .header = old_flac_header
diff -r 93d4898d9b6e -r 6c71b789c69e oggparseogm.c
--- a/oggparseogm.c	Sun Aug 24 17:24:34 2008 +0000
+++ b/oggparseogm.c	Sun Aug 24 17:37:43 2008 +0000
@@ -149,28 +149,28 @@
     return 0;
 }
 
-const ogg_codec_t ogm_video_codec = {
+const ogg_codec_t ff_ogm_video_codec = {
     .magic = "\001video",
     .magicsize = 6,
     .header = ogm_header,
     .packet = ogm_packet
 };
 
-const ogg_codec_t ogm_audio_codec = {
+const ogg_codec_t ff_ogm_audio_codec = {
     .magic = "\001audio",
     .magicsize = 6,
     .header = ogm_header,
     .packet = ogm_packet
 };
 
-const ogg_codec_t ogm_text_codec = {
+const ogg_codec_t ff_ogm_text_codec = {
     .magic = "\001text",
     .magicsize = 5,
     .header = ogm_header,
     .packet = ogm_packet
 };
 
-const ogg_codec_t ogm_old_codec = {
+const ogg_codec_t ff_ogm_old_codec = {
     .magic = "\001Direct Show Samples embedded in Ogg",
     .magicsize = 35,
     .header = ogm_dshow_header,
diff -r 93d4898d9b6e -r 6c71b789c69e oggparsespeex.c
--- a/oggparsespeex.c	Sun Aug 24 17:24:34 2008 +0000
+++ b/oggparsespeex.c	Sun Aug 24 17:37:43 2008 +0000
@@ -54,7 +54,7 @@
     return 0;
 }
 
-const ogg_codec_t speex_codec = {
+const ogg_codec_t ff_speex_codec = {
     .magic = "Speex   ",
     .magicsize = 8,
     .header = speex_header
diff -r 93d4898d9b6e -r 6c71b789c69e oggparsetheora.c
--- a/oggparsetheora.c	Sun Aug 24 17:24:34 2008 +0000
+++ b/oggparsetheora.c	Sun Aug 24 17:37:43 2008 +0000
@@ -130,7 +130,7 @@
     return iframe + pframe;
 }
 
-const ogg_codec_t theora_codec = {
+const ogg_codec_t ff_theora_codec = {
     .magic = "\200theora",
     .magicsize = 7,
     .header = theora_header,
diff -r 93d4898d9b6e -r 6c71b789c69e oggparsevorbis.c
--- a/oggparsevorbis.c	Sun Aug 24 17:24:34 2008 +0000
+++ b/oggparsevorbis.c	Sun Aug 24 17:37:43 2008 +0000
@@ -219,7 +219,7 @@
     return os->seq < 3;
 }
 
-const ogg_codec_t vorbis_codec = {
+const ogg_codec_t ff_vorbis_codec = {
     .magic = "\001vorbis",
     .magicsize = 7,
     .header = vorbis_header