har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Warning and compatibility fixes.

Browse Source 
Originally committed as revision 1902 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Falk Hüffner 2003-05-24 18:48:30 +00:00
parent f184683552
commit 4cfbf61bf1
12 changed files with 20 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libavcodec/cyuv.c
View File

@ -37,7 +37,6 @@
#include "avcodec.h" #include "avcodec.h"
#include "dsputil.h" #include "dsputil.h"
#include "mpegvideo.h" #include "mpegvideo.h"
#include "bswap.h"
typedef struct CyuvDecodeContext { typedef struct CyuvDecodeContext {

12
libavcodec/h264.c
View File

@ -1484,7 +1484,7 @@ static void pred4x4_down_right_c(uint8_t *src, uint8_t *topright, int stride){
src[2+0*stride]= src[2+0*stride]=
src[3+1*stride]=(t0 + 2*t1 + t2 + 2)>>2; src[3+1*stride]=(t0 + 2*t1 + t2 + 2)>>2;
src[3+0*stride]=(t1 + 2*t2 + t3 + 2)>>2; src[3+0*stride]=(t1 + 2*t2 + t3 + 2)>>2;
}; }
static void pred4x4_down_left_c(uint8_t *src, uint8_t *topright, int stride){ static void pred4x4_down_left_c(uint8_t *src, uint8_t *topright, int stride){
LOAD_TOP_EDGE LOAD_TOP_EDGE
@ -1507,7 +1507,7 @@ static void pred4x4_down_left_c(uint8_t *src, uint8_t *topright, int stride){
src[3+2*stride]= src[3+2*stride]=
src[2+3*stride]=(t5 + t7 + 2*t6 + 2)>>2; src[2+3*stride]=(t5 + t7 + 2*t6 + 2)>>2;
src[3+3*stride]=(t6 + 3*t7 + 2)>>2; src[3+3*stride]=(t6 + 3*t7 + 2)>>2;
}; }
static void pred4x4_vertical_right_c(uint8_t *src, uint8_t *topright, int stride){ static void pred4x4_vertical_right_c(uint8_t *src, uint8_t *topright, int stride){
const int lt= src[-1-1*stride]; const int lt= src[-1-1*stride];
@ -1531,7 +1531,7 @@ static void pred4x4_vertical_right_c(uint8_t *src, uint8_t *topright, int stride
src[3+1*stride]=(t1 + 2*t2 + t3 + 2)>>2; src[3+1*stride]=(t1 + 2*t2 + t3 + 2)>>2;
src[0+2*stride]=(lt + 2*l0 + l1 + 2)>>2; src[0+2*stride]=(lt + 2*l0 + l1 + 2)>>2;
src[0+3*stride]=(l0 + 2*l1 + l2 + 2)>>2; src[0+3*stride]=(l0 + 2*l1 + l2 + 2)>>2;
}; }
static void pred4x4_vertical_left_c(uint8_t *src, uint8_t *topright, int stride){ static void pred4x4_vertical_left_c(uint8_t *src, uint8_t *topright, int stride){
LOAD_TOP_EDGE LOAD_TOP_EDGE
@ -1554,7 +1554,7 @@ static void pred4x4_vertical_left_c(uint8_t *src, uint8_t *topright, int stride)
src[3+1*stride]= src[3+1*stride]=
src[2+3*stride]=(t3 + 2*t4 + t5 + 2)>>2; src[2+3*stride]=(t3 + 2*t4 + t5 + 2)>>2;
src[3+3*stride]=(t4 + 2*t5 + t6 + 2)>>2; src[3+3*stride]=(t4 + 2*t5 + t6 + 2)>>2;
}; }
static void pred4x4_horizontal_up_c(uint8_t *src, uint8_t *topright, int stride){ static void pred4x4_horizontal_up_c(uint8_t *src, uint8_t *topright, int stride){
LOAD_LEFT_EDGE LOAD_LEFT_EDGE
@ -1575,7 +1575,7 @@ static void pred4x4_horizontal_up_c(uint8_t *src, uint8_t *topright, int stride)
src[2+2*stride]= src[2+2*stride]=
src[2+3*stride]= src[2+3*stride]=
src[3+3*stride]=l3; src[3+3*stride]=l3;
}; }
static void pred4x4_horizontal_down_c(uint8_t *src, uint8_t *topright, int stride){ static void pred4x4_horizontal_down_c(uint8_t *src, uint8_t *topright, int stride){
const int lt= src[-1-1*stride]; const int lt= src[-1-1*stride];
@ -1599,7 +1599,7 @@ static void pred4x4_horizontal_down_c(uint8_t *src, uint8_t *topright, int strid
src[3+3*stride]=(l0 + 2*l1 + l2 + 2)>>2; src[3+3*stride]=(l0 + 2*l1 + l2 + 2)>>2;
src[0+3*stride]=(l2 + l3 + 1)>>1; src[0+3*stride]=(l2 + l3 + 1)>>1;
src[1+3*stride]=(l1 + 2*l2 + l3 + 2)>>2; src[1+3*stride]=(l1 + 2*l2 + l3 + 2)>>2;
}; }
static void pred16x16_vertical_c(uint8_t *src, int stride){ static void pred16x16_vertical_c(uint8_t *src, int stride){
int i; int i;

2
libavcodec/huffyuv.c
View File

@ -1097,7 +1097,7 @@ static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size,
char *p= avctx->stats_out; char *p= avctx->stats_out;
for(i=0; i<3; i++){ for(i=0; i<3; i++){
for(j=0; j<256; j++){ for(j=0; j<256; j++){
sprintf(p, "%Ld ", s->stats[i][j]); sprintf(p, "%llu ", s->stats[i][j]);
p+= strlen(p); p+= strlen(p);
s->stats[i][j]= 0; s->stats[i][j]= 0;
} }

17
libavcodec/imgconvert.c
View File

@ -747,14 +747,13 @@ static void yuv422p_to_yuv422(AVPicture *dst, AVPicture *src,
cm[(((y) - 128) * FIX(127.0/112.0) + (ONE_HALF + (128 << SCALEBITS))) >> SCALEBITS] cm[(((y) - 128) * FIX(127.0/112.0) + (ONE_HALF + (128 << SCALEBITS))) >> SCALEBITS]
/* NOTE: the clamp is really necessary! */ /* NOTE: the clamp is really necessary! */
#define C_JPEG_TO_CCIR(y)\ static inline int C_JPEG_TO_CCIR(int y) {
({\ y = (((y - 128) * FIX(112.0/127.0) + (ONE_HALF + (128 << SCALEBITS))) >> SCALEBITS);
int __y;\ if (y < 16)
__y = ((((y) - 128) * FIX(112.0/127.0) + (ONE_HALF + (128 << SCALEBITS))) >> SCALEBITS);\ y = 16;
if (__y < 16)\ return y;
__y = 16;\ }
__y;\
})
#define RGB_TO_Y(r, g, b) \ #define RGB_TO_Y(r, g, b) \
((FIX(0.29900) * (r) + FIX(0.58700) * (g) + \ ((FIX(0.29900) * (r) + FIX(0.58700) * (g) + \
@ -1608,8 +1607,6 @@ static int avpicture_alloc(AVPicture *picture,
void *ptr; void *ptr;
size = avpicture_get_size(pix_fmt, width, height); size = avpicture_get_size(pix_fmt, width, height);
if (size < 0)
goto fail;
ptr = av_malloc(size); ptr = av_malloc(size);
if (!ptr) if (!ptr)
goto fail; goto fail;

1
libavcodec/indeo3.c
View File

@ -26,7 +26,6 @@
#include "avcodec.h" #include "avcodec.h"
#include "dsputil.h" #include "dsputil.h"
#include "mpegvideo.h" #include "mpegvideo.h"
#include "bswap.h"
#include "indeo3data.h" #include "indeo3data.h"

2
libavcodec/libpostproc/postprocess.c
View File

@ -765,7 +765,7 @@ static void reallocBuffers(PPContext *c, int width, int height, int stride, int
reallocAlign((void **)&c->forcedQPTable, 8, mbWidth*sizeof(QP_STORE_T)); reallocAlign((void **)&c->forcedQPTable, 8, mbWidth*sizeof(QP_STORE_T));
} }
static void global_init(){ static void global_init(void){
int i; int i;
memset(clip_table, 0, 256); memset(clip_table, 0, 256);
for(i=256; i<512; i++) for(i=256; i<512; i++)

1
libavcodec/svq1.c
View File

@ -37,7 +37,6 @@
#include "avcodec.h" #include "avcodec.h"
#include "dsputil.h" #include "dsputil.h"
#include "mpegvideo.h" #include "mpegvideo.h"
#include "bswap.h"
#define bit_buffer_t GetBitContext #define bit_buffer_t GetBitContext
static inline unsigned int get_bit_cache(GetBitContext *s){ static inline unsigned int get_bit_cache(GetBitContext *s){

2
libavcodec/svq3.c
View File

@ -199,7 +199,7 @@ static void pred4x4_down_left_svq3_c(uint8_t *src, uint8_t *topright, int stride
src[3+2*stride]= src[3+2*stride]=
src[2+3*stride]= src[2+3*stride]=
src[3+3*stride]=(l3 + t3)>>1; src[3+3*stride]=(l3 + t3)>>1;
}; }
static void pred16x16_plane_svq3_c(uint8_t *src, int stride){ static void pred16x16_plane_svq3_c(uint8_t *src, int stride){
pred16x16_plane_compat_c(src, stride, 1); pred16x16_plane_compat_c(src, stride, 1);

2
libavcodec/utils.c
View File

@ -84,7 +84,7 @@ void *__av_mallocz_static(void** location, unsigned int size)
return ptr; return ptr;
} }
/* free all static arrays and reset pointers to 0 */ /* free all static arrays and reset pointers to 0 */
void av_free_static() void av_free_static(void)
{ {
if (array_static) if (array_static)
{ {

1
libavcodec/vp3.c
View File

@ -35,7 +35,6 @@
#include "dsputil.h" #include "dsputil.h"
#include "mpegvideo.h" #include "mpegvideo.h"
#include "dsputil.h" #include "dsputil.h"
#include "bswap.h"
#include "vp3data.h" #include "vp3data.h"

4
libavformat/asf.c
View File

@ -993,7 +993,7 @@ static int asf_get_packet(AVFormatContext *s)
int c = get_byte(pb); int c = get_byte(pb);
if (c != 0x82) { if (c != 0x82) {
if (!url_feof(pb)) if (!url_feof(pb))
printf("ff asf bad header %x at:%Ld\n", c, url_ftell(pb)); printf("ff asf bad header %x at:%lld\n", c, url_ftell(pb));
return -EIO; return -EIO;
} }
if ((c & 0x0f) == 2) { // always true for now if ((c & 0x0f) == 2) { // always true for now
@ -1220,7 +1220,7 @@ static int asf_read_close(AVFormatContext *s)
static int asf_read_seek(AVFormatContext *s, int64_t pts) static int asf_read_seek(AVFormatContext *s, int64_t pts)
{ {
printf("SEEK TO %Ld", pts); printf("SEEK TO %lld", pts);
return -1; return -1;
} }

2
libavformat/mov.c
View File

@ -1369,7 +1369,7 @@ static int mov_read_header(AVFormatContext *s, AVFormatParameters *ap)
/* check MOV header */ /* check MOV header */
err = mov_read_default(mov, pb, atom); err = mov_read_default(mov, pb, atom);
if (err<0 || (!mov->found_moov && !mov->found_mdat)) { if (err<0 || (!mov->found_moov && !mov->found_mdat)) {
fprintf(stderr, "mov: header not found !!! (err:%d, moov:%d, mdat:%d) pos:%Ld\n", fprintf(stderr, "mov: header not found !!! (err:%d, moov:%d, mdat:%d) pos:%lld\n",
err, mov->found_moov, mov->found_mdat, url_ftell(pb)); err, mov->found_moov, mov->found_mdat, url_ftell(pb));
return -1; return -1;
} }