Menu
▾
▴
[xine-cvs] CVS: xine-lib/src/libffmpeg/libavutil avutil.h, 1.3, 1.4 common.h, 1.7, 1.8 intreadwrite.h, 1.1, 1.2 log.c, 1.2, 1.3 log.h, 1.2, 1.3
|
From: Miguel F. <mig...@us...> - 2007-01-28 18:38:38
|
Update of /cvsroot/xine/xine-lib/src/libffmpeg/libavutil In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv18103/src/libffmpeg/libavutil Modified Files: avutil.h common.h intreadwrite.h log.c log.h Log Message: another ffmpeg sync to include h264 security fixes Index: avutil.h =================================================================== RCS file: /cvsroot/xine/xine-lib/src/libffmpeg/libavutil/avutil.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- avutil.h 4 Dec 2006 22:25:26 -0000 1.3 +++ avutil.h 28 Jan 2007 18:38:35 -0000 1.4 @@ -34,8 +34,8 @@ #define AV_STRINGIFY(s) AV_TOSTRING(s) #define AV_TOSTRING(s) #s -#define LIBAVUTIL_VERSION_INT ((49<<16)+(1<<8)+0) -#define LIBAVUTIL_VERSION 49.1.0 +#define LIBAVUTIL_VERSION_INT ((49<<16)+(2<<8)+0) +#define LIBAVUTIL_VERSION 49.2.0 #define LIBAVUTIL_BUILD LIBAVUTIL_VERSION_INT #define LIBAVUTIL_IDENT "Lavu" AV_STRINGIFY(LIBAVUTIL_VERSION) Index: common.h =================================================================== RCS file: /cvsroot/xine/xine-lib/src/libffmpeg/libavutil/common.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- common.h 13 Jan 2007 21:19:54 -0000 1.7 +++ common.h 28 Jan 2007 18:38:35 -0000 1.8 @@ -120,7 +120,7 @@ /* median of 3 */ static inline int mid_pred(int a, int b, int c) { -#if HAVE_CMOV +#ifdef HAVE_CMOV int i=b; asm volatile( "cmp %2, %1 \n\t" Index: intreadwrite.h =================================================================== RCS file: /cvsroot/xine/xine-lib/src/libffmpeg/libavutil/intreadwrite.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- intreadwrite.h 13 Jan 2007 21:19:54 -0000 1.1 +++ intreadwrite.h 28 Jan 2007 18:38:35 -0000 1.2 @@ -26,17 +26,40 @@ #endif /* !__GNUC__ */ /* endian macros */ -#if !defined(BE_16) || !defined(BE_32) || !defined(LE_16) || !defined(LE_32) -#define BE_16(x) ((((uint8_t*)(x))[0] << 8) | ((uint8_t*)(x))[1]) -#define BE_32(x) ((((uint8_t*)(x))[0] << 24) | \ +#define AV_RB8(x) (((uint8_t*)(x))[0]) +#define AV_WB8(p, i, d) { ((uint8_t*)(p))[(i)] = (d); } + +#define AV_RB16(x) ((((uint8_t*)(x))[0] << 8) | ((uint8_t*)(x))[1]) +#define AV_WB16(p, i, d) { \ + ((uint8_t*)(p))[(i)+1] = (d); \ + ((uint8_t*)(p))[(i)] = (d)>>8; } + +#define AV_RB32(x) ((((uint8_t*)(x))[0] << 24) | \ (((uint8_t*)(x))[1] << 16) | \ (((uint8_t*)(x))[2] << 8) | \ ((uint8_t*)(x))[3]) -#define LE_16(x) ((((uint8_t*)(x))[1] << 8) | ((uint8_t*)(x))[0]) -#define LE_32(x) ((((uint8_t*)(x))[3] << 24) | \ +#define AV_WB32(p, i, d) { \ + ((uint8_t*)(p))[(i)+3] = (d); \ + ((uint8_t*)(p))[(i)+2] = (d)>>8; \ + ((uint8_t*)(p))[(i)+1] = (d)>>16; \ + ((uint8_t*)(p))[(i)] = (d)>>24; } + +#define AV_RL8(x) AV_RB8(x) +#define AV_WL8(p, i, d) AV_WB8(p, i, d) + +#define AV_RL16(x) ((((uint8_t*)(x))[1] << 8) | ((uint8_t*)(x))[0]) +#define AV_WL16(p, i, d) { \ + ((uint8_t*)(p))[(i)] = (d); \ + ((uint8_t*)(p))[(i)+1] = (d)>>8; } + +#define AV_RL32(x) ((((uint8_t*)(x))[3] << 24) | \ (((uint8_t*)(x))[2] << 16) | \ (((uint8_t*)(x))[1] << 8) | \ ((uint8_t*)(x))[0]) -#endif +#define AV_WL32(p, i, d) { \ + ((uint8_t*)(p))[(i)] = (d); \ + ((uint8_t*)(p))[(i)+1] = (d)>>8; \ + ((uint8_t*)(p))[(i)+2] = (d)>>16; \ + ((uint8_t*)(p))[(i)+3] = (d)>>24; } #endif /* INTREADWRITE_H */ Index: log.c =================================================================== RCS file: /cvsroot/xine/xine-lib/src/libffmpeg/libavutil/log.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- log.c 4 Dec 2006 22:25:26 -0000 1.2 +++ log.c 28 Jan 2007 18:38:36 -0000 1.3 @@ -28,7 +28,7 @@ int av_log_level = AV_LOG_INFO; -static void av_log_default_callback(void* ptr, int level, const char* fmt, va_list vl) +void av_log_default_callback(void* ptr, int level, const char* fmt, va_list vl) { static int print_prefix=1; AVClass* avc= ptr ? *(AVClass**)ptr : NULL; Index: log.h =================================================================== RCS file: /cvsroot/xine/xine-lib/src/libffmpeg/libavutil/log.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- log.h 4 Dec 2006 22:25:26 -0000 1.2 +++ log.h 28 Jan 2007 18:38:36 -0000 1.3 @@ -38,10 +38,49 @@ /* av_log API */ +#if LIBAVUTIL_VERSION_INT < (50<<16) #define AV_LOG_QUIET -1 +#define AV_LOG_FATAL 0 #define AV_LOG_ERROR 0 +#define AV_LOG_WARNING 1 #define AV_LOG_INFO 1 +#define AV_LOG_VERBOSE 1 #define AV_LOG_DEBUG 2 +#else +#define AV_LOG_QUIET -8 + +/** + * something went really wrong and we will crash now + */ +#define AV_LOG_PANIC 0 + +/** + * something went wrong and recovery is not possible + * like no header in a format which depends on it or a combination + * of parameters which are not allowed + */ +#define AV_LOG_FATAL 8 + +/** + * something went wrong and cannot losslessly be recovered + * but not all future data is affected + */ +#define AV_LOG_ERROR 16 + +/** + * something somehow does not look correct / something which may or may not + * lead to some problems like use of -vstrict -2 + */ +#define AV_LOG_WARNING 24 + +#define AV_LOG_INFO 32 +#define AV_LOG_VERBOSE 40 + +/** + * stuff which is only useful for libav* developers + */ +#define AV_LOG_DEBUG 48 +#endif extern int av_log_level; #ifdef __GNUC__ @@ -55,6 +94,7 @@ extern int av_log_get_level(void); extern void av_log_set_level(int); extern void av_log_set_callback(void (*)(void*, int, const char*, va_list)); +extern void av_log_default_callback(void* ptr, int level, const char* fmt, va_list vl); #else extern void (*av_vlog)(void*, int, const char*, va_list); #endif |