Permalink
Browse files

* UINTX -> uintx_t INTX -> intx_t

Originally committed as revision 1578 to svn://svn.ffmpeg.org/ffmpeg/trunk
  • Loading branch information...
1 parent 4596673 commit 0c1a9edad463bd6e22b30c19b700b099c7093fc1 Zdenek Kabelac committed Feb 11, 2003
Showing with 1,688 additions and 1,721 deletions.
  1. +26 −26 ffmpeg.c
  2. +40 −40 ffserver.c
  3. +6 −6 libavcodec/a52dec.c
  4. +12 −12 libavcodec/ac3.h
  5. +6 −6 libavcodec/ac3dec.c
  6. +51 −51 libavcodec/ac3enc.c
  7. +21 −21 libavcodec/ac3tab.h
  8. +3 −3 libavcodec/adpcm.c
  9. +5 −5 libavcodec/apiexample.c
  10. +4 −4 libavcodec/armv4l/mpegvideo_arm.c
  11. +12 −12 libavcodec/avcodec.h
  12. +12 −12 libavcodec/common.c
  13. +36 −67 libavcodec/common.h
  14. +1 −1 libavcodec/cyuv.c
  15. +9 −9 libavcodec/dct-test.c
  16. +194 −194 libavcodec/dsputil.c
  17. +28 −28 libavcodec/dsputil.h
  18. +37 −37 libavcodec/dv.c
  19. +13 −13 libavcodec/dvdata.h
  20. +20 −20 libavcodec/error_resilience.c
  21. +3 −3 libavcodec/fft-test.c
  22. +53 −54 libavcodec/h263.c
  23. +16 −16 libavcodec/h263data.h
  24. +3 −3 libavcodec/h263dec.c
  25. +1 −1 libavcodec/huffyuv.c
  26. +42 −42 libavcodec/i386/dsputil_mmx.c
  27. +16 −16 libavcodec/i386/dsputil_mmx_avg.h
  28. +14 −14 libavcodec/i386/dsputil_mmx_rnd.h
  29. +17 −17 libavcodec/i386/motion_est_mmx.c
  30. +11 −11 libavcodec/i386/mpegvideo_mmx.c
  31. +2 −2 libavcodec/i386/mpegvideo_mmx_template.c
  32. +2 −2 libavcodec/i386/simple_idct_mmx.c
  33. +53 −53 libavcodec/imgconvert.c
  34. +36 −36 libavcodec/imgresample.c
  35. +5 −5 libavcodec/jfdctfst.c
  36. +17 −17 libavcodec/jfdctint.c
  37. +10 −10 libavcodec/jrevdct.c
  38. +21 −21 libavcodec/mace.c
  39. +46 −46 libavcodec/mjpeg.c
  40. +4 −4 libavcodec/mlib/dsputil_mlib.c
  41. +10 −10 libavcodec/motion_est.c
  42. +20 −20 libavcodec/motion_test.c
  43. +30 −30 libavcodec/mpeg12.c
  44. +19 −19 libavcodec/mpeg12data.h
  45. +13 −13 libavcodec/mpeg4data.h
  46. +2 −2 libavcodec/mpegaudio.c
  47. +3 −3 libavcodec/mpegaudio.h
  48. +78 −78 libavcodec/mpegaudiodec.c
  49. +41 −41 libavcodec/mpegaudiodectab.h
  50. +2 −2 libavcodec/mpegaudiotab.h
  51. +87 −87 libavcodec/mpegvideo.c
  52. +77 −77 libavcodec/mpegvideo.h
  53. +16 −16 libavcodec/msmpeg4.c
  54. +1 −1 libavcodec/oggvorbis.c
  55. +6 −6 libavcodec/pcm.c
  56. +4 −4 libavcodec/ppc/dsputil_altivec.c
  57. +5 −5 libavcodec/ppc/dsputil_altivec.h
  58. +1 −1 libavcodec/ppc/gmc_altivec.c
  59. +4 −4 libavcodec/ppc/idct_altivec.c
  60. +2 −2 libavcodec/ppc/mpegvideo_ppc.c
  61. +1 −1 libavcodec/ps2/dsputil_mmi.c
  62. +2 −2 libavcodec/ps2/idct_mmi.c
  63. +2 −2 libavcodec/ps2/mpegvideo_mmi.c
  64. +2 −2 libavcodec/resample.c
  65. +10 −10 libavcodec/rv10.c
  66. +14 −14 libavcodec/simple_idct.c
  67. +7 −7 libavcodec/simple_idct.h
  68. +1 −1 libavcodec/svq1.c
  69. +6 −6 libavcodec/utils.c
  70. +1 −1 libavcodec/wmadec.c
  71. +7 −8 libavcodec/wmv2.c
  72. +29 −29 libavformat/asf.c
  73. +5 −5 libavformat/au.c
  74. +2 −2 libavformat/audio.c
  75. +15 −15 libavformat/avformat.h
  76. +3 −3 libavformat/avidec.c
  77. +4 −4 libavformat/avienc.c
  78. +11 −11 libavformat/avio.h
  79. +30 −30 libavformat/aviobuf.c
  80. +2 −2 libavformat/crc.c
  81. +1 −1 libavformat/dv1394.c
  82. +22 −22 libavformat/ffm.c
  83. +1 −1 libavformat/framehook.c
  84. +1 −1 libavformat/framehook.h
  85. +7 −7 libavformat/gif.c
  86. +13 −13 libavformat/grab.c
  87. +3 −3 libavformat/http.c
  88. +6 −6 libavformat/img.c
  89. +2 −2 libavformat/jpeg.c
  90. +37 −37 libavformat/mov.c
  91. +21 −21 libavformat/mpeg.c
  92. +1 −1 libavformat/mpegts.c
  93. +4 −4 libavformat/mpjpeg.c
  94. +1 −1 libavformat/pnm.c
  95. +1 −1 libavformat/raw.c
  96. +7 −7 libavformat/rm.c
  97. +23 −23 libavformat/rtp.c
  98. +2 −2 libavformat/rtpproto.c
  99. +2 −2 libavformat/rtsp.h
  100. +7 −7 libavformat/swf.c
  101. +2 −2 libavformat/tcp.c
  102. +2 −2 libavformat/udp.c
  103. +22 −22 libavformat/utils.c
  104. +3 −3 libavformat/wav.c
  105. +1 −1 libavformat/yuv.c
  106. +2 −2 libavformat/yuv4mpeg.c
  107. +4 −4 tests/videogen.c
  108. +4 −4 vhook/fish.c
  109. +2 −2 vhook/imlib2.c
  110. +1 −1 vhook/null.c
View
@@ -40,7 +40,7 @@
#define INFINITY HUGE_VAL
#endif
-#define MAXINT64 INT64_C(0x7fffffffffffffff)
+#define MAXINT64 int64_t_C(0x7fffffffffffffff)
typedef struct {
const char *name;
@@ -142,7 +142,7 @@ static int audio_disable = 0;
static int audio_channels = 1;
static int audio_codec_id = CODEC_ID_NONE;
-static INT64 recording_time = 0;
+static int64_t recording_time = 0;
static int file_overwrite = 0;
static char *str_title = NULL;
static char *str_author = NULL;
@@ -178,7 +178,7 @@ typedef struct AVOutputStream {
for A/V sync */
double sync_ipts;
double sync_ipts_offset;
- INT64 sync_opts;
+ int64_t sync_opts;
/* video only */
int video_resample; /* video_resample and video_crop are mutually exclusive */
AVPicture pict_tmp; /* temporary image for resampling */
@@ -201,7 +201,7 @@ typedef struct AVInputStream {
AVStream *st;
int discard; /* true if stream data should be discarded */
int decoding_needed; /* true if the packets must be decoded in 'raw_fifo' */
- INT64 sample_index; /* current sample */
+ int64_t sample_index; /* current sample */
int frame_decoded; /* true if a video or audio frame has been decoded */
} AVInputStream;
@@ -320,9 +320,9 @@ static void do_audio_out(AVFormatContext *s,
AVInputStream *ist,
unsigned char *buf, int size)
{
- UINT8 *buftmp;
- UINT8 audio_buf[2*MAX_AUDIO_PACKET_SIZE]; /* XXX: allocate it */
- UINT8 audio_out[4*MAX_AUDIO_PACKET_SIZE]; /* XXX: allocate it - yep really WMA */
+ uint8_t *buftmp;
+ uint8_t audio_buf[2*MAX_AUDIO_PACKET_SIZE]; /* XXX: allocate it */
+ uint8_t audio_out[4*MAX_AUDIO_PACKET_SIZE]; /* XXX: allocate it - yep really WMA */
int size_out, frame_bytes, ret;
AVCodecContext *enc;
@@ -376,7 +376,7 @@ static void do_audio_out(AVFormatContext *s,
static void write_picture(AVFormatContext *s, int index, AVPicture *picture,
int pix_fmt, int w, int h)
{
- UINT8 *buf, *src, *dest;
+ uint8_t *buf, *src, *dest;
int size, j, i;
/* XXX: not efficient, should add test if we can take
@@ -473,7 +473,7 @@ static void pre_process_video_frame(AVInputStream *ist, AVPicture *picture, void
AVCodecContext *dec;
AVPicture *picture2;
AVPicture picture_tmp;
- UINT8 *buf = 0;
+ uint8_t *buf = 0;
dec = &ist->st->codec;
@@ -520,8 +520,8 @@ static void do_video_out(AVFormatContext *s,
int nb_frames, i, ret;
AVPicture *final_picture, *formatted_picture;
AVPicture picture_format_temp, picture_crop_temp;
- static UINT8 *video_buffer;
- UINT8 *buf = NULL, *buf1 = NULL;
+ static uint8_t *video_buffer;
+ uint8_t *buf = NULL, *buf1 = NULL;
AVCodecContext *enc, *dec;
#define VIDEO_BUFFER_SIZE (1024*1024)
@@ -675,7 +675,7 @@ static void do_video_out(AVFormatContext *s,
avoid any copies. We support temorarily the older
method. */
av_write_frame(s, ost->index,
- (UINT8 *)final_picture, sizeof(AVPicture));
+ (uint8_t *)final_picture, sizeof(AVPicture));
} else {
write_picture(s, ost->index, final_picture, enc->pix_fmt,
enc->width, enc->height);
@@ -697,13 +697,13 @@ static void do_video_stats(AVFormatContext *os, AVOutputStream *ost,
int frame_size)
{
static FILE *fvstats=NULL;
- static INT64 total_size = 0;
+ static int64_t total_size = 0;
char filename[40];
time_t today2;
struct tm *today;
AVCodecContext *enc;
int frame_number;
- INT64 ti;
+ int64_t ti;
double ti1, bitrate, avg_bitrate;
if (!fvstats) {
@@ -749,14 +749,14 @@ static void print_report(AVFormatContext **output_files,
char buf[1024];
AVOutputStream *ost;
AVFormatContext *oc, *os;
- INT64 total_size;
+ int64_t total_size;
AVCodecContext *enc;
int frame_number, vid, i;
double bitrate, ti1, pts;
- static INT64 last_time = -1;
+ static int64_t last_time = -1;
if (!is_last_report) {
- INT64 cur_time;
+ int64_t cur_time;
/* display the report every 0.5 seconds */
cur_time = av_gettime();
if (last_time == -1) {
@@ -1019,7 +1019,7 @@ static int av_encode(AVFormatContext **output_files,
ost->topBand = frame_topBand;
ost->leftBand = frame_leftBand;
} else {
- UINT8 *buf;
+ uint8_t *buf;
ost->video_resample = 1;
ost->video_crop = 0; // cropping is handled as part of resample
buf = av_malloc((codec->width * codec->height * 3) / 2);
@@ -1179,9 +1179,9 @@ static int av_encode(AVFormatContext **output_files,
for(;;) {
int file_index, ist_index;
AVPacket pkt;
- UINT8 *ptr;
+ uint8_t *ptr;
int len;
- UINT8 *data_buf;
+ uint8_t *data_buf;
int data_size, got_picture;
AVPicture picture;
short samples[AVCODEC_MAX_AUDIO_FRAME_SIZE / 2];
@@ -1252,7 +1252,7 @@ static int av_encode(AVFormatContext **output_files,
ptr = pkt.data;
pts_set = 0;
while (len > 0) {
- INT64 ipts;
+ int64_t ipts;
ipts = AV_NOPTS_VALUE;
@@ -1288,7 +1288,7 @@ static int av_encode(AVFormatContext **output_files,
len -= ret;
continue;
}
- data_buf = (UINT8 *)samples;
+ data_buf = (uint8_t *)samples;
break;
case CODEC_TYPE_VIDEO:
if (ist->st->codec.codec_id == CODEC_ID_RAWVIDEO) {
@@ -1348,7 +1348,7 @@ static int av_encode(AVFormatContext **output_files,
/* XXX: add mpeg4 too ? */
if (ist->st->codec.codec_id == CODEC_ID_MPEG1VIDEO) {
if (ist->st->codec.pict_type != B_TYPE) {
- INT64 tmp;
+ int64_t tmp;
tmp = ist->last_ip_pts;
ist->last_ip_pts = ist->frac_pts.val;
ist->frac_pts.val = tmp;
@@ -2539,12 +2539,12 @@ static void opt_pass(const char *pass_str)
}
#if defined(CONFIG_WIN32) || defined(CONFIG_OS2)
-static INT64 getutime(void)
+static int64_t getutime(void)
{
return av_gettime();
}
#else
-static INT64 getutime(void)
+static int64_t getutime(void)
{
struct rusage rusage;
@@ -2770,7 +2770,7 @@ int main(int argc, char **argv)
int optindex, i;
const char *opt, *arg;
const OptionDef *po;
- INT64 ti;
+ int64_t ti;
av_register_all();
Oops, something went wrong.

0 comments on commit 0c1a9ed

Please sign in to comment.