ref: b98919ac46cb331ea5fcd6bd4c30db272e6f4a63
parent: 9e74e752b2f9a7f892b7f1f1c064d56496d7bbf4
author: menno <menno>
date: Sun Jan 25 15:14:34 EST 2009
Solved copyright symbol issues in tagupdate
--- a/common/mp4ff/mp4ffint.h
+++ b/common/mp4ff/mp4ffint.h
@@ -25,7 +25,7 @@
** Commercial non-GPL licensing of this software is possible.
** For more info contact Nero AG through Mpeg4AAClicense@nero.com.
**
-** $Id: mp4ffint.h,v 1.25 2009/01/19 23:56:30 menno Exp $
+** $Id: mp4ffint.h,v 1.26 2009/01/25 20:14:34 menno Exp $
**/
#ifndef MP4FF_INTERNAL_H
@@ -38,51 +38,6 @@
#include "mp4ff_int_types.h"
#include <stdlib.h>
-#if defined(_WIN32) && !defined(_WIN32_WCE)
-
-static __inline uint32_t GetDWLE( void const * _p )
-{- uint8_t * p = (uint8_t *)_p;
- return ( ((uint32_t)p[3] << 24) | ((uint32_t)p[2] << 16)
- | ((uint32_t)p[1] << 8) | p[0] );
-}
-static __inline uint32_t U32_AT( void const * _p )
-{- uint8_t * p = (uint8_t *)_p;
- return ( ((uint32_t)p[0] << 24) | ((uint32_t)p[1] << 16)
- | ((uint32_t)p[2] << 8) | p[3] );
-}
-static __inline uint64_t U64_AT( void const * _p )
-{- uint8_t * p = (uint8_t *)_p;
- return ( ((uint64_t)p[0] << 56) | ((uint64_t)p[1] << 48)
- | ((uint64_t)p[2] << 40) | ((uint64_t)p[3] << 32)
- | ((uint64_t)p[4] << 24) | ((uint64_t)p[5] << 16)
- | ((uint64_t)p[6] << 8) | p[7] );
-}
-
-#ifdef WORDS_BIGENDIAN
-# define VLC_FOURCC( a, b, c, d ) \
- ( ((uint32_t)d) | ( ((uint32_t)c) << 8 ) \
- | ( ((uint32_t)b) << 16 ) | ( ((uint32_t)a) << 24 ) )
-# define VLC_TWOCC( a, b ) \
- ( (uint16_t)(b) | ( (uint16_t)(a) << 8 ) )
-
-#else
-# define VLC_FOURCC( a, b, c, d ) \
- ( ((uint32_t)a) | ( ((uint32_t)b) << 8 ) \
- | ( ((uint32_t)c) << 16 ) | ( ((uint32_t)d) << 24 ) )
-# define VLC_TWOCC( a, b ) \
- ( (uint16_t)(a) | ( (uint16_t)(b) << 8 ) )
-#endif
-
-#define FOURCC_user VLC_FOURCC( 'u', 's', 'e', 'r' )
-#define FOURCC_key VLC_FOURCC( 'k', 'e', 'y', ' ' )
-#define FOURCC_iviv VLC_FOURCC( 'i', 'v', 'i', 'v' )
-#define FOURCC_name VLC_FOURCC( 'n', 'a', 'm', 'e' )
-#define FOURCC_priv VLC_FOURCC( 'p', 'r', 'i', 'v' )
-
-#endif
#define MAX_TRACKS 1024
#define TRACK_UNKNOWN 0
#define TRACK_AUDIO 1
--- a/common/mp4ff/mp4tagupdate.c
+++ b/common/mp4ff/mp4tagupdate.c
@@ -212,14 +212,14 @@
static stdmeta_entry stdmetas[] =
{- {"�nam","title"},- {"�ART","artist"},- {"�wrt","writer"},- {"�alb","album"},- {"�day","date"},- {"�too","tool"},- {"�cmt","comment"},-// {"�gen","genre"},+ {"\xA9" "nam","title"},+ {"\xA9" "ART","artist"},+ {"\xA9" "wrt","writer"},+ {"\xA9" "alb","album"},+ {"\xA9" "day","date"},+ {"\xA9" "too","tool"},+ {"\xA9" "cmt","comment"},+// {"\xA9" "gen","genre"}, {"cpil","compilation"}, // {"trkn","track"}, // {"disk","disc"},