X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Fvoc.c;h=314623ee74b07c7409fc9425fd2f862bc3b62256;hb=d1241ff3b289b49607910258e3e99a050a6df65a;hp=750f78d15f43c7df4b0daff217d29e165b05ac05;hpb=e5a389a1b70a32a56aa83377e88bf718251aa8f0;p=ffmpeg

diff --git a/libavformat/voc.c b/libavformat/voc.c
index 750f78d15f4..314623ee74b 100644
--- a/libavformat/voc.c
+++ b/libavformat/voc.c
@@ -2,28 +2,29 @@
  * Creative Voice File common data.
  * Copyright (c) 2006  Aurelien Jacobs <aurel@gnuage.org>
  *
- * 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
  */
 
 #include "voc.h"
+#include "internal.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 +33,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},
 };