*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#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 CodecTag 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},
{CODEC_ID_PCM_ALAW, 0x06},
{CODEC_ID_PCM_MULAW, 0x07},
{CODEC_ID_ADPCM_CT, 0x0200},
- {0, 0},
+ {CODEC_ID_NONE, 0},
};