[Ffmpeg-cvslog] r7240 - in trunk: libavcodec/avcodec.h libavcodec/mpegaudiodec.c libavcodec/mpegvideo.c libavformat/asf-enc.c libavformat/avformat.h libavformat/avienc.c libavformat/ffm.c libavformat/grab.c libavformat/os_support.c libavformat/utils.c libavformat/v4l2.c libavutil/common.h libavutil/internal.h
mru
subversion
Thu Dec 7 00:46:13 CET 2006
Author: mru
Date: Thu Dec 7 00:46:11 2006
New Revision: 7240
Modified:
trunk/libavcodec/avcodec.h
trunk/libavcodec/mpegaudiodec.c
trunk/libavcodec/mpegvideo.c
trunk/libavformat/asf-enc.c
trunk/libavformat/avformat.h
trunk/libavformat/avienc.c
trunk/libavformat/ffm.c
trunk/libavformat/grab.c
trunk/libavformat/os_support.c
trunk/libavformat/utils.c
trunk/libavformat/v4l2.c
trunk/libavutil/common.h
trunk/libavutil/internal.h
Log:
use the standard INT64_C() macro for 64-bit constants
Modified: trunk/libavcodec/avcodec.h
==============================================================================
--- trunk/libavcodec/avcodec.h (original)
+++ trunk/libavcodec/avcodec.h Thu Dec 7 00:46:11 2006
@@ -43,7 +43,7 @@
#define LIBAVCODEC_IDENT "Lavc" AV_STRINGIFY(LIBAVCODEC_VERSION)
-#define AV_NOPTS_VALUE int64_t_C(0x8000000000000000)
+#define AV_NOPTS_VALUE INT64_C(0x8000000000000000)
#define AV_TIME_BASE 1000000
#define AV_TIME_BASE_Q (AVRational){1, AV_TIME_BASE}
Modified: trunk/libavcodec/mpegaudiodec.c
==============================================================================
--- trunk/libavcodec/mpegaudiodec.c (original)
+++ trunk/libavcodec/mpegaudiodec.c Thu Dec 7 00:46:11 2006
@@ -327,7 +327,7 @@
for(i=0;i<15;i++) {
int n, norm;
n = i + 2;
- norm = ((int64_t_C(1) << n) * FRAC_ONE) / ((1 << n) - 1);
+ norm = ((INT64_C(1) << n) * FRAC_ONE) / ((1 << n) - 1);
scale_factor_mult[i][0] = MULL(FIXR(1.0 * 2.0), norm);
scale_factor_mult[i][1] = MULL(FIXR(0.7937005259 * 2.0), norm);
scale_factor_mult[i][2] = MULL(FIXR(0.6299605249 * 2.0), norm);
Modified: trunk/libavcodec/mpegvideo.c
==============================================================================
--- trunk/libavcodec/mpegvideo.c (original)
+++ trunk/libavcodec/mpegvideo.c Thu Dec 7 00:46:11 2006
@@ -132,7 +132,7 @@
/* (1<<36)/19952 >= (1<<36)/(aanscales[i] * qscale * quant_matrix[i]) >= (1<<36)/249205026 */
/* 3444240 >= (1<<36)/(aanscales[i] * qscale * quant_matrix[i]) >= 275 */
- qmat[qscale][i] = (int)((uint64_t_C(1) << QMAT_SHIFT) /
+ qmat[qscale][i] = (int)((UINT64_C(1) << QMAT_SHIFT) /
(qscale * quant_matrix[j]));
}
} else if (dsp->fdct == fdct_ifast
@@ -147,7 +147,7 @@
/* (1<<36)/19952 >= (1<<36)/(aanscales[i] * qscale * quant_matrix[i]) >= (1<<36)/249205026 */
/* 3444240 >= (1<<36)/(aanscales[i] * qscale * quant_matrix[i]) >= 275 */
- qmat[qscale][i] = (int)((uint64_t_C(1) << (QMAT_SHIFT + 14)) /
+ qmat[qscale][i] = (int)((UINT64_C(1) << (QMAT_SHIFT + 14)) /
(aanscales[i] * qscale * quant_matrix[j]));
}
} else {
@@ -158,7 +158,7 @@
so (1<<19) / 16 >= (1<<19) / (qscale * quant_matrix[i]) >= (1<<19) / 7905
so 32768 >= (1<<19) / (qscale * quant_matrix[i]) >= 67
*/
- qmat[qscale][i] = (int)((uint64_t_C(1) << QMAT_SHIFT) / (qscale * quant_matrix[j]));
+ qmat[qscale][i] = (int)((UINT64_C(1) << QMAT_SHIFT) / (qscale * quant_matrix[j]));
// qmat [qscale][i] = (1 << QMAT_SHIFT_MMX) / (qscale * quant_matrix[i]);
qmat16[qscale][0][i] = (1 << QMAT_SHIFT_MMX) / (qscale * quant_matrix[j]);
Modified: trunk/libavformat/asf-enc.c
==============================================================================
--- trunk/libavformat/asf-enc.c (original)
+++ trunk/libavformat/asf-enc.c Thu Dec 7 00:46:11 2006
@@ -269,8 +269,8 @@
{
int64_t t;
- t = ti * int64_t_C(10000000);
- t += int64_t_C(116444736000000000);
+ t = ti * INT64_C(10000000);
+ t += INT64_C(116444736000000000);
return t;
}
@@ -739,7 +739,7 @@
pts = (pkt->pts != AV_NOPTS_VALUE) ? pkt->pts : pkt->dts;
if (pts == AV_NOPTS_VALUE) {
if (codec->codec_type == CODEC_TYPE_AUDIO) {
- duration = (codec->frame_number * (int64_t)codec->frame_size * int64_t_C(10000000)) /
+ duration = (codec->frame_number * (int64_t)codec->frame_size * INT64_C(10000000)) /
codec->sample_rate;
} else {
duration = av_rescale(codec->frame_number * (int64_t)codec->time_base.num, 10000000, codec->time_base.den);
@@ -755,8 +755,8 @@
/* check index */
if ((!asf->is_streamed) && (codec->codec_type == CODEC_TYPE_VIDEO) && (pkt->flags & PKT_FLAG_KEY)) {
- start_sec = (int)(duration / int64_t_C(10000000));
- if (start_sec != (int)(asf->last_indexed_pts / int64_t_C(10000000))) {
+ start_sec = (int)(duration / INT64_C(10000000));
+ if (start_sec != (int)(asf->last_indexed_pts / INT64_C(10000000))) {
for(i=asf->nb_index_count;i<start_sec;i++) {
if (i>=asf->nb_index_memory_alloc) {
asf->nb_index_memory_alloc += ASF_INDEX_BLOCK;
Modified: trunk/libavformat/avformat.h
==============================================================================
--- trunk/libavformat/avformat.h (original)
+++ trunk/libavformat/avformat.h Thu Dec 7 00:46:11 2006
@@ -40,11 +40,11 @@
/* packet functions */
#ifndef MAXINT64
-#define MAXINT64 int64_t_C(0x7fffffffffffffff)
+#define MAXINT64 INT64_C(0x7fffffffffffffff)
#endif
#ifndef MININT64
-#define MININT64 int64_t_C(0x8000000000000000)
+#define MININT64 INT64_C(0x8000000000000000)
#endif
typedef struct AVPacket {
Modified: trunk/libavformat/avienc.c
==============================================================================
--- trunk/libavformat/avienc.c (original)
+++ trunk/libavformat/avienc.c Thu Dec 7 00:46:11 2006
@@ -163,7 +163,7 @@
nb_frames = 0;
if(video_enc){
- put_le32(pb, (uint32_t)(int64_t_C(1000000) * video_enc->time_base.num / video_enc->time_base.den));
+ put_le32(pb, (uint32_t)(INT64_C(1000000) * video_enc->time_base.num / video_enc->time_base.den));
} else {
put_le32(pb, 0);
}
Modified: trunk/libavformat/ffm.c
==============================================================================
--- trunk/libavformat/ffm.c (original)
+++ trunk/libavformat/ffm.c Thu Dec 7 00:46:11 2006
@@ -469,7 +469,7 @@
ffm->file_size = url_fsize(pb);
adjust_write_index(s);
} else {
- ffm->file_size = (uint64_t_C(1) << 63) - 1;
+ ffm->file_size = (UINT64_C(1) << 63) - 1;
}
nb_streams = get_be32(pb);
Modified: trunk/libavformat/grab.c
==============================================================================
--- trunk/libavformat/grab.c (original)
+++ trunk/libavformat/grab.c Thu Dec 7 00:46:11 2006
@@ -321,16 +321,16 @@
struct timespec ts;
/* Calculate the time of the next frame */
- s->time_frame += int64_t_C(1000000);
+ s->time_frame += INT64_C(1000000);
/* wait based on the frame rate */
for(;;) {
curtime = av_gettime();
delay = s->time_frame * s->frame_rate_base / s->frame_rate - curtime;
if (delay <= 0) {
- if (delay < int64_t_C(-1000000) * s->frame_rate_base / s->frame_rate) {
+ if (delay < INT64_C(-1000000) * s->frame_rate_base / s->frame_rate) {
/* printf("grabbing is %d frames late (dropping)\n", (int) -(delay / 16666)); */
- s->time_frame += int64_t_C(1000000);
+ s->time_frame += INT64_C(1000000);
}
break;
}
Modified: trunk/libavformat/os_support.c
==============================================================================
--- trunk/libavformat/os_support.c (original)
+++ trunk/libavformat/os_support.c Thu Dec 7 00:46:11 2006
@@ -42,11 +42,11 @@
int64_t av_gettime(void)
{
#if defined(CONFIG_WINCE)
- return timeGetTime() * int64_t_C(1000);
+ return timeGetTime() * INT64_C(1000);
#elif defined(__MINGW32__)
struct timeb tb;
_ftime(&tb);
- return ((int64_t)tb.time * int64_t_C(1000) + (int64_t)tb.millitm) * int64_t_C(1000);
+ return ((int64_t)tb.time * INT64_C(1000) + (int64_t)tb.millitm) * INT64_C(1000);
#else
struct timeval tv;
gettimeofday(&tv,NULL);
Modified: trunk/libavformat/utils.c
==============================================================================
--- trunk/libavformat/utils.c (original)
+++ trunk/libavformat/utils.c Thu Dec 7 00:46:11 2006
@@ -2758,7 +2758,7 @@
if (duration)
return 0;
else
- return now * int64_t_C(1000000);
+ return now * INT64_C(1000000);
}
if (duration) {
Modified: trunk/libavformat/v4l2.c
==============================================================================
--- trunk/libavformat/v4l2.c (original)
+++ trunk/libavformat/v4l2.c Thu Dec 7 00:46:11 2006
@@ -316,7 +316,7 @@
/* Image is at s->buff_start[buf.index] */
memcpy(frame, s->buf_start[buf.index], buf.bytesused);
- *ts = buf.timestamp.tv_sec * int64_t_C(1000000) + buf.timestamp.tv_usec;
+ *ts = buf.timestamp.tv_sec * INT64_C(1000000) + buf.timestamp.tv_usec;
res = ioctl (s->fd, VIDIOC_QBUF, &buf);
if (res < 0) {
Modified: trunk/libavutil/common.h
==============================================================================
--- trunk/libavutil/common.h (original)
+++ trunk/libavutil/common.h Thu Dec 7 00:46:11 2006
@@ -53,9 +53,9 @@
# include <inttypes.h>
-#ifndef int64_t_C
-#define int64_t_C(c) (c ## LL)
-#define uint64_t_C(c) (c ## ULL)
+#ifndef INT64_C
+#define INT64_C(c) (c ## LL)
+#define UINT64_C(c) (c ## ULL)
#endif
#if defined(__MINGW32__) && !defined(BUILD_AVUTIL) && defined(BUILD_SHARED_AV)
Modified: trunk/libavutil/internal.h
==============================================================================
--- trunk/libavutil/internal.h (original)
+++ trunk/libavutil/internal.h Thu Dec 7 00:46:11 2006
@@ -107,11 +107,11 @@
#endif
#ifndef INT64_MAX
-#define INT64_MAX int64_t_C(9223372036854775807)
+#define INT64_MAX INT64_C(9223372036854775807)
#endif
#ifndef UINT64_MAX
-#define UINT64_MAX uint64_t_C(0xFFFFFFFFFFFFFFFF)
+#define UINT64_MAX UINT64_C(0xFFFFFFFFFFFFFFFF)
#endif
#ifndef INT_BIT
More information about the ffmpeg-cvslog
mailing list