diff --git a/libavutil/common.h b/libavutil/common.h index 673043746e..12b9937ac5 100644 --- a/libavutil/common.h +++ b/libavutil/common.h @@ -322,21 +322,6 @@ static inline int ff_get_fourcc(const char *s){ #define MKTAG(a,b,c,d) (a | (b << 8) | (c << 16) | (d << 24)) #define MKBETAG(a,b,c,d) (d | (c << 8) | (b << 16) | (a << 24)) -/*! - * \def PUT_UTF8(val, GET_BYTE, ERROR) - * converts a 32-bit unicode character to its utf-8 encoded form (up to 6 bytes long). - * \param val is an input only argument and should be of type uint32_t. It holds - * a ucs4 encoded unicode character that is to be converted to utf-8. If - * val is given as a function it's executed only once. - * \param tmp is a temporary variable and should be of type uint8_t. It - * represents an intermediate value during conversion that is to be - * outputted by PUT_BYTE. - * \param PUT_BYTE writes the converted utf-8 bytes to any proper destination. - * It could be a function or a statement, and uses tmp as the input byte. - * For example, PUT_BYTE could be "*output++ = tmp;" PUT_BYTE will be - * executed up to 6 times, depending on the length of the converted - * unicode character. - */ #define GET_UTF8(val, GET_BYTE, ERROR)\ val= GET_BYTE;\ {\ @@ -352,6 +337,21 @@ static inline int ff_get_fourcc(const char *s){ }\ } +/*! + * \def PUT_UTF8(val, GET_BYTE, ERROR) + * converts a 32-bit unicode character to its utf-8 encoded form (up to 6 bytes long). + * \param val is an input only argument and should be of type uint32_t. It holds + * a ucs4 encoded unicode character that is to be converted to utf-8. If + * val is given as a function it's executed only once. + * \param tmp is a temporary variable and should be of type uint8_t. It + * represents an intermediate value during conversion that is to be + * outputted by PUT_BYTE. + * \param PUT_BYTE writes the converted utf-8 bytes to any proper destination. + * It could be a function or a statement, and uses tmp as the input byte. + * For example, PUT_BYTE could be "*output++ = tmp;" PUT_BYTE will be + * executed up to 6 times, depending on the length of the converted + * unicode character. + */ #define PUT_UTF8(val, tmp, PUT_BYTE)\ {\ int bytes, shift;\