mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
warning fixes by Luca Abeni, lucabe72 ##@## email ##.## it
Originally committed as revision 4898 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
82e415b1fc
commit
f038fe8b4a
2
ffmpeg.c
2
ffmpeg.c
@ -1172,7 +1172,7 @@ static int output_packet(AVInputStream *ist, int ist_index,
|
|||||||
int data_size, got_picture;
|
int data_size, got_picture;
|
||||||
AVFrame picture;
|
AVFrame picture;
|
||||||
void *buffer_to_free;
|
void *buffer_to_free;
|
||||||
static int samples_size= 0;
|
static unsigned int samples_size= 0;
|
||||||
static short *samples= NULL;
|
static short *samples= NULL;
|
||||||
AVSubtitle subtitle, *subtitle_to_free;
|
AVSubtitle subtitle, *subtitle_to_free;
|
||||||
int got_subtitle;
|
int got_subtitle;
|
||||||
|
@ -123,7 +123,7 @@ typedef struct FourXContext{
|
|||||||
int last_dc;
|
int last_dc;
|
||||||
DCTELEM __align8 block[6][64];
|
DCTELEM __align8 block[6][64];
|
||||||
uint8_t *bitstream_buffer;
|
uint8_t *bitstream_buffer;
|
||||||
int bitstream_buffer_size;
|
unsigned int bitstream_buffer_size;
|
||||||
CFrameBuffer cfrm[CFRAME_BUFFER_COUNT];
|
CFrameBuffer cfrm[CFRAME_BUFFER_COUNT];
|
||||||
} FourXContext;
|
} FourXContext;
|
||||||
|
|
||||||
|
@ -48,7 +48,7 @@ typedef struct ASV1Context{
|
|||||||
uint16_t __align8 intra_matrix[64];
|
uint16_t __align8 intra_matrix[64];
|
||||||
int __align8 q_intra_matrix[64];
|
int __align8 q_intra_matrix[64];
|
||||||
uint8_t *bitstream_buffer;
|
uint8_t *bitstream_buffer;
|
||||||
int bitstream_buffer_size;
|
unsigned int bitstream_buffer_size;
|
||||||
} ASV1Context;
|
} ASV1Context;
|
||||||
|
|
||||||
static const uint8_t scantab[64]={
|
static const uint8_t scantab[64]={
|
||||||
|
@ -66,7 +66,7 @@ typedef struct FLACContext {
|
|||||||
uint8_t *bitstream;
|
uint8_t *bitstream;
|
||||||
int bitstream_size;
|
int bitstream_size;
|
||||||
int bitstream_index;
|
int bitstream_index;
|
||||||
int allocated_bitstream_size;
|
unsigned int allocated_bitstream_size;
|
||||||
} FLACContext;
|
} FLACContext;
|
||||||
|
|
||||||
#define METADATA_TYPE_STREAMINFO 0
|
#define METADATA_TYPE_STREAMINFO 0
|
||||||
|
@ -162,7 +162,7 @@ typedef struct H264Context{
|
|||||||
#define NAL_SPS_EXT 13
|
#define NAL_SPS_EXT 13
|
||||||
#define NAL_AUXILIARY_SLICE 19
|
#define NAL_AUXILIARY_SLICE 19
|
||||||
uint8_t *rbsp_buffer;
|
uint8_t *rbsp_buffer;
|
||||||
int rbsp_buffer_size;
|
unsigned int rbsp_buffer_size;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Used to parse AVC variant of h264
|
* Used to parse AVC variant of h264
|
||||||
|
@ -72,7 +72,7 @@ typedef struct HYuvContext{
|
|||||||
VLC vlc[3];
|
VLC vlc[3];
|
||||||
AVFrame picture;
|
AVFrame picture;
|
||||||
uint8_t *bitstream_buffer;
|
uint8_t *bitstream_buffer;
|
||||||
int bitstream_buffer_size;
|
unsigned int bitstream_buffer_size;
|
||||||
DSPContext dsp;
|
DSPContext dsp;
|
||||||
}HYuvContext;
|
}HYuvContext;
|
||||||
|
|
||||||
|
@ -49,7 +49,7 @@ typedef struct MDECContext{
|
|||||||
uint16_t __align8 intra_matrix[64];
|
uint16_t __align8 intra_matrix[64];
|
||||||
int __align8 q_intra_matrix[64];
|
int __align8 q_intra_matrix[64];
|
||||||
uint8_t *bitstream_buffer;
|
uint8_t *bitstream_buffer;
|
||||||
int bitstream_buffer_size;
|
unsigned int bitstream_buffer_size;
|
||||||
int block_last_index[6];
|
int block_last_index[6];
|
||||||
} MDECContext;
|
} MDECContext;
|
||||||
|
|
||||||
|
@ -169,7 +169,7 @@ static const uint16_t inter_rvlc[170][2]={ //note this is identical to the intra
|
|||||||
{0x3F7C, 15},{0x3F7D, 15},{0x0000, 4}
|
{0x3F7C, 15},{0x3F7D, 15},{0x0000, 4}
|
||||||
};
|
};
|
||||||
|
|
||||||
static const uint8_t inter_rvlc_run[169]={
|
static const int8_t inter_rvlc_run[169]={
|
||||||
0, 0, 0, 0, 0, 0, 0, 0,
|
0, 0, 0, 0, 0, 0, 0, 0,
|
||||||
0, 0, 0, 0, 0, 0, 0, 0,
|
0, 0, 0, 0, 0, 0, 0, 0,
|
||||||
0, 0, 0, 1, 1, 1, 1, 1,
|
0, 0, 0, 1, 1, 1, 1, 1,
|
||||||
@ -194,7 +194,7 @@ static const uint8_t inter_rvlc_run[169]={
|
|||||||
43, 44,
|
43, 44,
|
||||||
};
|
};
|
||||||
|
|
||||||
static const uint8_t inter_rvlc_level[169]={
|
static const int8_t inter_rvlc_level[169]={
|
||||||
1, 2, 3, 4, 5, 6, 7, 8,
|
1, 2, 3, 4, 5, 6, 7, 8,
|
||||||
9, 10, 11, 12, 13, 14, 15, 16,
|
9, 10, 11, 12, 13, 14, 15, 16,
|
||||||
17, 18, 19, 1, 2, 3, 4, 5,
|
17, 18, 19, 1, 2, 3, 4, 5,
|
||||||
@ -273,7 +273,7 @@ static const uint16_t intra_rvlc[170][2]={
|
|||||||
{0x3F7C, 15},{0x3F7D, 15},{0x0000, 4}
|
{0x3F7C, 15},{0x3F7D, 15},{0x0000, 4}
|
||||||
};
|
};
|
||||||
|
|
||||||
static const uint8_t intra_rvlc_run[169]={
|
static const int8_t intra_rvlc_run[169]={
|
||||||
0, 0, 0, 0, 0, 0, 0, 0,
|
0, 0, 0, 0, 0, 0, 0, 0,
|
||||||
0, 0, 0, 0, 0, 0, 0, 0,
|
0, 0, 0, 0, 0, 0, 0, 0,
|
||||||
0, 0, 0, 0, 0, 0, 0, 0,
|
0, 0, 0, 0, 0, 0, 0, 0,
|
||||||
@ -298,7 +298,7 @@ static const uint8_t intra_rvlc_run[169]={
|
|||||||
43, 44,
|
43, 44,
|
||||||
};
|
};
|
||||||
|
|
||||||
static const uint8_t intra_rvlc_level[169]={
|
static const int8_t intra_rvlc_level[169]={
|
||||||
1, 2, 3, 4, 5, 6, 7, 8,
|
1, 2, 3, 4, 5, 6, 7, 8,
|
||||||
9, 10, 11, 12, 13, 14, 15, 16,
|
9, 10, 11, 12, 13, 14, 15, 16,
|
||||||
17, 18, 19, 20, 21, 22, 23, 24,
|
17, 18, 19, 20, 21, 22, 23, 24,
|
||||||
|
@ -194,7 +194,7 @@ typedef struct ParseContext{
|
|||||||
uint8_t *buffer;
|
uint8_t *buffer;
|
||||||
int index;
|
int index;
|
||||||
int last_index;
|
int last_index;
|
||||||
int buffer_size;
|
unsigned int buffer_size;
|
||||||
uint32_t state; ///< contains the last few bytes in MSB order
|
uint32_t state; ///< contains the last few bytes in MSB order
|
||||||
int frame_start_found;
|
int frame_start_found;
|
||||||
int overread; ///< the number of bytes which where irreversibly read from the next frame
|
int overread; ///< the number of bytes which where irreversibly read from the next frame
|
||||||
@ -610,7 +610,7 @@ typedef struct MpegEncContext {
|
|||||||
int divx_packed;
|
int divx_packed;
|
||||||
uint8_t *bitstream_buffer; //Divx 5.01 puts several frames in a single one, this is used to reorder them
|
uint8_t *bitstream_buffer; //Divx 5.01 puts several frames in a single one, this is used to reorder them
|
||||||
int bitstream_buffer_size;
|
int bitstream_buffer_size;
|
||||||
int allocated_bitstream_buffer_size;
|
unsigned int allocated_bitstream_buffer_size;
|
||||||
|
|
||||||
int xvid_build;
|
int xvid_build;
|
||||||
|
|
||||||
|
@ -84,7 +84,7 @@ typedef struct ShortenContext {
|
|||||||
uint8_t *bitstream;
|
uint8_t *bitstream;
|
||||||
int bitstream_size;
|
int bitstream_size;
|
||||||
int bitstream_index;
|
int bitstream_index;
|
||||||
int allocated_bitstream_size;
|
unsigned int allocated_bitstream_size;
|
||||||
int header_size;
|
int header_size;
|
||||||
uint8_t header[OUT_BUFFER_SIZE];
|
uint8_t header[OUT_BUFFER_SIZE];
|
||||||
int version;
|
int version;
|
||||||
|
@ -3223,7 +3223,7 @@ int av_read_image(ByteIOContext *pb, const char *filename,
|
|||||||
AVImageFormat *fmt,
|
AVImageFormat *fmt,
|
||||||
int (*alloc_cb)(void *, AVImageInfo *info), void *opaque)
|
int (*alloc_cb)(void *, AVImageInfo *info), void *opaque)
|
||||||
{
|
{
|
||||||
char buf[PROBE_BUF_SIZE];
|
uint8_t buf[PROBE_BUF_SIZE];
|
||||||
AVProbeData probe_data, *pd = &probe_data;
|
AVProbeData probe_data, *pd = &probe_data;
|
||||||
offset_t pos;
|
offset_t pos;
|
||||||
int ret;
|
int ret;
|
||||||
|
Loading…
Reference in New Issue
Block a user