Browse Source

* more warning cleanups

* adding const & statics

Originally committed as revision 387 to svn://svn.ffmpeg.org/ffmpeg/trunk
tags/v0.5
Zdenek Kabelac 23 years ago
parent
commit
a266644f56
5 changed files with 11 additions and 12 deletions
  1. +1
    -1
      libav/au.c
  2. +2
    -2
      libav/avi.h
  3. +2
    -2
      libav/avienc.c
  4. +1
    -2
      libav/gif.c
  5. +5
    -5
      libav/mov.c

+ 1
- 1
libav/au.c View File

@@ -73,7 +73,7 @@ static int au_write_header(AVFormatContext *s)
} }


static int au_write_packet(AVFormatContext *s, int stream_index_ptr, static int au_write_packet(AVFormatContext *s, int stream_index_ptr,
UINT8 *buf, int size)
UINT8 *buf, int size, int force_pts)
{ {
ByteIOContext *pb = &s->pb; ByteIOContext *pb = &s->pb;
put_buffer(pb, buf, size); put_buffer(pb, buf, size);


+ 2
- 2
libav/avi.h View File

@@ -21,8 +21,8 @@ typedef struct CodecTag {
extern CodecTag codec_bmp_tags[]; extern CodecTag codec_bmp_tags[];
extern CodecTag codec_wav_tags[]; extern CodecTag codec_wav_tags[];


unsigned int codec_get_tag(CodecTag *tags, int id);
int codec_get_id(CodecTag *tags, unsigned int tag);
unsigned int codec_get_tag(const CodecTag *tags, int id);
int codec_get_id(const CodecTag *tags, unsigned int tag);


/* avidec.c */ /* avidec.c */
int avi_read_header(AVFormatContext *s, AVFormatParameters *ap); int avi_read_header(AVFormatContext *s, AVFormatParameters *ap);


+ 2
- 2
libav/avienc.c View File

@@ -68,7 +68,7 @@ CodecTag codec_bmp_tags[] = {
{ 0, 0 }, { 0, 0 },
}; };


unsigned int codec_get_tag(CodecTag *tags, int id)
unsigned int codec_get_tag(const CodecTag *tags, int id)
{ {
while (tags->id != 0) { while (tags->id != 0) {
if (tags->id == id) if (tags->id == id)
@@ -78,7 +78,7 @@ unsigned int codec_get_tag(CodecTag *tags, int id)
return 0; return 0;
} }


int codec_get_id(CodecTag *tags, unsigned int tag)
int codec_get_id(const CodecTag *tags, unsigned int tag)
{ {
while (tags->id != 0) { while (tags->id != 0) {
if (tags->tag == tag) if (tags->tag == tag)


+ 1
- 2
libav/gif.c View File

@@ -365,7 +365,7 @@ static int gif_write_video(AVFormatContext *s,
} }


static int gif_write_packet(AVFormatContext *s, int stream_index, static int gif_write_packet(AVFormatContext *s, int stream_index,
UINT8 *buf, int size)
UINT8 *buf, int size, int force_pts)
{ {
AVCodecContext *codec = &s->streams[stream_index]->codec; AVCodecContext *codec = &s->streams[stream_index]->codec;
if (codec->codec_type == CODEC_TYPE_AUDIO) if (codec->codec_type == CODEC_TYPE_AUDIO)
@@ -401,4 +401,3 @@ AVFormat gif_format = {
NULL, /* read_packet */ NULL, /* read_packet */
NULL, /* read_close */ NULL, /* read_close */
}; };


+ 5
- 5
libav/mov.c View File

@@ -76,7 +76,7 @@ void print_atom(const char *str, UINT32 type, UINT64 offset, UINT64 size)
/* getting rid of these */ /* getting rid of these */
#define CODEC_TYPE_MOV_OTHER 2 #define CODEC_TYPE_MOV_OTHER 2


CodecTag mov_video_tags[] = {
static const CodecTag mov_video_tags[] = {
/* { CODEC_ID_, MKTAG('c', 'v', 'i', 'd') }, *//* Cinepak */ /* { CODEC_ID_, MKTAG('c', 'v', 'i', 'd') }, *//* Cinepak */
/* { CODEC_ID_JPEG, MKTAG('j', 'p', 'e', 'g') }, *//* JPEG */ /* { CODEC_ID_JPEG, MKTAG('j', 'p', 'e', 'g') }, *//* JPEG */
{ CODEC_ID_H263, MKTAG('r', 'a', 'w', ' ') }, /* Uncompressed RGB */ { CODEC_ID_H263, MKTAG('r', 'a', 'w', ' ') }, /* Uncompressed RGB */
@@ -97,7 +97,7 @@ CodecTag mov_video_tags[] = {
{ 0, 0 }, { 0, 0 },
}; };


CodecTag mov_audio_tags[] = {
static const CodecTag mov_audio_tags[] = {
/* { CODEC_ID_PCM_S16BE, MKTAG('N', 'O', 'N', 'E') }, *//* uncompressed */ /* { CODEC_ID_PCM_S16BE, MKTAG('N', 'O', 'N', 'E') }, *//* uncompressed */
{ CODEC_ID_PCM_S16BE, MKTAG('t', 'w', 'o', 's') }, /* 16 bits */ { CODEC_ID_PCM_S16BE, MKTAG('t', 'w', 'o', 's') }, /* 16 bits */
{ CODEC_ID_PCM_S8, MKTAG('t', 'w', 'o', 's') }, /* 8 bits */ { CODEC_ID_PCM_S8, MKTAG('t', 'w', 'o', 's') }, /* 8 bits */
@@ -765,7 +765,7 @@ static void mov_free_stream_context(MOVStreamContext *sc)
} }
} }


int mov_read_header(AVFormatContext *s, AVFormatParameters *ap)
static int mov_read_header(AVFormatContext *s, AVFormatParameters *ap)
{ {
MOVContext *mov; MOVContext *mov;
ByteIOContext *pb = &s->pb; ByteIOContext *pb = &s->pb;
@@ -839,7 +839,7 @@ int mov_read_header(AVFormatContext *s, AVFormatParameters *ap)


/* Yes, this is ugly... I didn't write the specs of QT :p */ /* Yes, this is ugly... I didn't write the specs of QT :p */
/* XXX:remove useless commented code sometime */ /* XXX:remove useless commented code sometime */
int mov_read_packet(AVFormatContext *s, AVPacket *pkt)
static int mov_read_packet(AVFormatContext *s, AVPacket *pkt)
{ {
MOVContext *mov = s->priv_data; MOVContext *mov = s->priv_data;
INT64 offset = 0x0FFFFFFFFFFFFFFF; INT64 offset = 0x0FFFFFFFFFFFFFFF;
@@ -911,7 +911,7 @@ again:
return 0; return 0;
} }


int mov_read_close(AVFormatContext *s)
static int mov_read_close(AVFormatContext *s)
{ {
int i; int i;
MOVContext *mov = s->priv_data; MOVContext *mov = s->priv_data;


Loading…
Cancel
Save