X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Fvoc.c;h=1b7d499278fcf9ea87e73e3edf16135b41a54ce9;hb=81688e68f93f3142e2093f1a3d226edaeb179992;hp=97b73d1639bd49fa612103c847c84a99548d9377;hpb=7caf0cc62cad8a5548c3e7e0b35ead00584100c8;p=ffmpeg

diff --git a/libavformat/voc.c b/libavformat/voc.c
index 97b73d1639b..1b7d499278f 100644
--- a/libavformat/voc.c
+++ b/libavformat/voc.c
@@ -2,35 +2,36 @@
  * 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
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ * 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[] = {
-    {CODEC_ID_PCM_U8,        0x00},
-    {CODEC_ID_ADPCM_SBPRO_4, 0x01},
-    {CODEC_ID_ADPCM_SBPRO_3, 0x02},
-    {CODEC_ID_ADPCM_SBPRO_2, 0x03},
-    {CODEC_ID_PCM_S16LE,     0x04},
-    {CODEC_ID_PCM_ALAW,      0x06},
-    {CODEC_ID_PCM_MULAW,     0x07},
-    {CODEC_ID_ADPCM_CT,    0x0200},
-    {0, 0},
+const AVCodecTag ff_voc_codec_tags[] = {
+    {AV_CODEC_ID_PCM_U8,        0x00},
+    {AV_CODEC_ID_ADPCM_SBPRO_4, 0x01},
+    {AV_CODEC_ID_ADPCM_SBPRO_3, 0x02},
+    {AV_CODEC_ID_ADPCM_SBPRO_2, 0x03},
+    {AV_CODEC_ID_PCM_S16LE,     0x04},
+    {AV_CODEC_ID_PCM_ALAW,      0x06},
+    {AV_CODEC_ID_PCM_MULAW,     0x07},
+    {AV_CODEC_ID_ADPCM_CT,    0x0200},
+    {AV_CODEC_ID_NONE,             0},
 };