MrBesen/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

get rid of the [4] limitation of codec tag lists

Browse Source 
Originally committed as revision 7596 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2007-01-21 12:08:31 +00:00
parent 5484dad7f6
commit 6c77805fc8
10 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/aiff.c
View File

@ -417,7 +417,7 @@ AVInputFormat aiff_demuxer = {
aiff_read_packet,
aiff_read_close,
aiff_read_seek,
.codec_tag= {codec_aiff_tags},
.codec_tag= (const AVCodecTag*[]){codec_aiff_tags, 0},
};
#endif
@ -433,6 +433,6 @@ AVOutputFormat aiff_muxer = {
aiff_write_header,
aiff_write_packet,
aiff_write_trailer,
.codec_tag= {codec_aiff_tags},
.codec_tag= (const AVCodecTag*[]){codec_aiff_tags, 0},
};
#endif

4
libavformat/asf-enc.c
View File

@ -849,7 +849,7 @@ AVOutputFormat asf_muxer = {
asf_write_packet,
asf_write_trailer,
.flags = AVFMT_GLOBALHEADER,
.codec_tag= {codec_asf_bmp_tags, codec_bmp_tags, codec_wav_tags},
.codec_tag= (const AVCodecTag*[]){codec_asf_bmp_tags, codec_bmp_tags, codec_wav_tags, 0},
};
#endif
@ -870,6 +870,6 @@ AVOutputFormat asf_stream_muxer = {
asf_write_packet,
asf_write_trailer,
.flags = AVFMT_GLOBALHEADER,
.codec_tag= {codec_asf_bmp_tags, codec_bmp_tags, codec_wav_tags},
.codec_tag= (const AVCodecTag*[]){codec_asf_bmp_tags, codec_bmp_tags, codec_wav_tags, 0},
};
#endif //CONFIG_ASF_STREAM_MUXER

4
libavformat/au.c
View File

@ -190,7 +190,7 @@ AVInputFormat au_demuxer = {
au_read_packet,
au_read_close,
pcm_read_seek,
.codec_tag= {codec_au_tags},
.codec_tag= (const AVCodecTag*[]){codec_au_tags, 0},
};
#endif
@ -206,6 +206,6 @@ AVOutputFormat au_muxer = {
au_write_header,
au_write_packet,
au_write_trailer,
.codec_tag= {codec_au_tags},
.codec_tag= (const AVCodecTag*[]){codec_au_tags, 0},
};
#endif //CONFIG_AU_MUXER

8
libavformat/avformat.h
View File

@ -162,7 +162,7 @@ typedef struct AVOutputFormat {
* list of supported codec_id-codec_tag pairs, ordered by "better choice first"
* the arrays are all CODEC_ID_NONE terminated
*/
const struct AVCodecTag *codec_tag[4];
const struct AVCodecTag **codec_tag;
/* private fields */
struct AVOutputFormat *next;
@ -219,7 +219,7 @@ typedef struct AVInputFormat {
(RTSP) */
int (*read_pause)(struct AVFormatContext *);
const struct AVCodecTag *codec_tag[4];
const struct AVCodecTag **codec_tag;
/* private fields */
struct AVInputFormat *next;
@ -408,8 +408,8 @@ void av_pkt_dump(FILE *f, AVPacket *pkt, int dump_payload);
void av_register_all(void);
/* codec tag <-> codec id */
enum CodecID av_codec_get_id(const struct AVCodecTag *tags[4], unsigned int tag);
unsigned int av_codec_get_tag(const struct AVCodecTag *tags[4], enum CodecID id);
enum CodecID av_codec_get_id(const struct AVCodecTag **tags, unsigned int tag);
unsigned int av_codec_get_tag(const struct AVCodecTag **tags, enum CodecID id);
/* media file input */
AVInputFormat *av_find_input_format(const char *short_name);

2
libavformat/avienc.c
View File

@ -575,6 +575,6 @@ AVOutputFormat avi_muxer = {
avi_write_header,
avi_write_packet,
avi_write_trailer,
.codec_tag= {codec_bmp_tags, codec_wav_tags},
.codec_tag= (const AVCodecTag*[]){codec_bmp_tags, codec_wav_tags, 0},
};
#endif //CONFIG_AVI_MUXER

2
libavformat/flvenc.c
View File

@ -332,5 +332,5 @@ AVOutputFormat flv_muxer = {
flv_write_header,
flv_write_packet,
flv_write_trailer,
.codec_tag= {flv_video_codec_ids, flv_audio_codec_ids},
.codec_tag= (const AVCodecTag*[]){flv_video_codec_ids, flv_audio_codec_ids, 0},
};

4
libavformat/riff.c
View File

@ -233,7 +233,7 @@ enum CodecID codec_get_id(const AVCodecTag *tags, unsigned int tag)
unsigned int av_codec_get_tag(const AVCodecTag *tags[4], enum CodecID id)
{
int i;
for(i=0; i<4 && tags[i]; i++){
for(i=0; tags && tags[i]; i++){
int tag= codec_get_tag(tags[i], id);
if(tag) return tag;
}
@ -243,7 +243,7 @@ unsigned int av_codec_get_tag(const AVCodecTag *tags[4], enum CodecID id)
enum CodecID av_codec_get_id(const AVCodecTag *tags[4], unsigned int tag)
{
int i;
for(i=0; i<4 && tags[i]; i++){
for(i=0; tags && tags[i]; i++){
enum CodecID id= codec_get_id(tags[i], tag);
if(id!=CODEC_ID_NONE) return id;
}

2
libavformat/vocdec.c
View File

@ -152,5 +152,5 @@ AVInputFormat voc_demuxer = {
voc_read_header,
voc_read_packet,
voc_read_close,
.codec_tag={voc_codec_tags},
.codec_tag=(const AVCodecTag*[]){voc_codec_tags, 0},
};

2
libavformat/vocenc.c
View File

@ -101,5 +101,5 @@ AVOutputFormat voc_muxer = {
voc_write_header,
voc_write_packet,
voc_write_trailer,
.codec_tag={voc_codec_tags},
.codec_tag=(const AVCodecTag*[]){voc_codec_tags, 0},
};

4
libavformat/wav.c
View File

@ -235,7 +235,7 @@ AVInputFormat wav_demuxer = {
wav_read_packet,
wav_read_close,
wav_read_seek,
.codec_tag= {codec_wav_tags},
.codec_tag= (const AVCodecTag*[]){codec_wav_tags, 0},
};
#endif
#ifdef CONFIG_WAV_MUXER
@ -250,6 +250,6 @@ AVOutputFormat wav_muxer = {
wav_write_header,
wav_write_packet,
wav_write_trailer,
.codec_tag= {codec_wav_tags},
.codec_tag= (const AVCodecTag*[]){codec_wav_tags, 0},
};
#endif