Browse Source

GCC 3.3.2 warnings patch by (Panagiotis Issaris <takis at lumumba dot luc dot ac dot be>)

Originally committed as revision 2440 to svn://svn.ffmpeg.org/ffmpeg/trunk
tags/v0.5
Panagiotis Issaris Michael Niedermayer 21 years ago
parent
commit
0bf92f7957
2 changed files with 5 additions and 5 deletions
  1. +2
    -2
      libavformat/ogg.c
  2. +3
    -3
      libavformat/utils.c

+ 2
- 2
libavformat/ogg.c View File

@@ -90,7 +90,7 @@ static int ogg_write_header(AVFormatContext *avfcontext)


static int ogg_write_packet(AVFormatContext *avfcontext, static int ogg_write_packet(AVFormatContext *avfcontext,
int stream_index, int stream_index,
unsigned char *buf, int size, int force_pts)
const uint8_t *buf, int size, int64_t force_pts)
{ {
OggContext *context = avfcontext->priv_data ; OggContext *context = avfcontext->priv_data ;
ogg_packet *op ; ogg_packet *op ;
@@ -110,7 +110,7 @@ static int ogg_write_packet(AVFormatContext *avfcontext,


while(l < size) { while(l < size) {
op = (ogg_packet*)(buf + l) ; op = (ogg_packet*)(buf + l) ;
op->packet = buf + l + sizeof(ogg_packet) ; /* fix data pointer */
op->packet = (uint8_t*) buf + l + sizeof( ogg_packet) ; /* fix data pointer */


if(!context->base_packet_no) { /* this is the first packet */ if(!context->base_packet_no) { /* this is the first packet */
context->base_packet_no = op->packetno ; context->base_packet_no = op->packetno ;


+ 3
- 3
libavformat/utils.c View File

@@ -294,7 +294,7 @@ int av_open_input_file(AVFormatContext **ic_ptr, const char *filename,
{ {
AVFormatContext *ic = NULL; AVFormatContext *ic = NULL;
int err, must_open_file; int err, must_open_file;
char buf[PROBE_BUF_SIZE];
unsigned char buf[PROBE_BUF_SIZE];
AVProbeData probe_data, *pd = &probe_data; AVProbeData probe_data, *pd = &probe_data;


ic = av_mallocz(sizeof(AVFormatContext)); ic = av_mallocz(sizeof(AVFormatContext));
@@ -1440,8 +1440,8 @@ int get_frame_filename(char *buf, int buf_size,
const char *path, int number) const char *path, int number)
{ {
const char *p; const char *p;
char *q, buf1[20];
int nd, len, c, percentd_found;
char *q, buf1[20], c;
int nd, len, percentd_found;


q = buf; q = buf;
p = path; p = path;


Loading…
Cancel
Save