Remove an unneeded local variable.

[ffmpeg] / libavformat / voc.c

diff --git a/libavformat/voc.c b/libavformat/voc.c
index 750f78d15f43c7df4b0daff217d29e165b05ac05..eed8db8cc7d740fe10ae05fb4f5b297eb7af8108 100644 (file)
--- a/libavformat/voc.c
+++ b/libavformat/voc.c
@@ -21,9 +21,9 @@
 
 #include "voc.h"
 
-const unsigned char voc_magic[21] = "Creative Voice File\x1A";
+const unsigned char ff_voc_magic[21] = "Creative Voice File\x1A";
 
-const AVCodecTag voc_codec_tags[] = {
+const AVCodecTag ff_voc_codec_tags[] = {
     {CODEC_ID_PCM_U8,        0x00},
     {CODEC_ID_ADPCM_SBPRO_4, 0x01},
     {CODEC_ID_ADPCM_SBPRO_3, 0x02},
@@ -32,5 +32,5 @@ const AVCodecTag voc_codec_tags[] = {
     {CODEC_ID_PCM_ALAW,      0x06},
     {CODEC_ID_PCM_MULAW,     0x07},
     {CODEC_ID_ADPCM_CT,    0x0200},
-    {0, 0},
+    {CODEC_ID_NONE,             0},
 };