virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-07-11 14:30:22 +02:00
Code Issues Releases Activity

Replace some occurrences of 0 with CODEC_ID_NONE.

Browse Source 
Fixes icc warning #188: enumerated type mixed with another type

Originally committed as revision 13135 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Carl Eugen Hoyos
2008-05-12 10:30:40 +00:00
parent d9481eb7f3
commit d9133126d3
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/img2.c
View File

@ -68,7 +68,7 @@ static const IdStrMap img_tags[] = {
{ CODEC_ID_SUNRAST , "im8"}, { CODEC_ID_SUNRAST , "im8"},
{ CODEC_ID_SUNRAST , "im24"}, { CODEC_ID_SUNRAST , "im24"},
{ CODEC_ID_SUNRAST , "sunras"}, { CODEC_ID_SUNRAST , "sunras"},
{0, NULL} { CODEC_ID_NONE , NULL}
}; };
static int sizes[][2] = { static int sizes[][2] = {

4
libavformat/mp3.c
View File

@ -668,7 +668,7 @@ AVOutputFormat mp2_muxer = {
#endif #endif
0, 0,
CODEC_ID_MP2, CODEC_ID_MP2,
0, CODEC_ID_NONE,
NULL, NULL,
mp3_write_packet, mp3_write_packet,
mp3_write_trailer, mp3_write_trailer,
@ -682,7 +682,7 @@ AVOutputFormat mp3_muxer = {
"mp3", "mp3",
0, 0,
CODEC_ID_MP3, CODEC_ID_MP3,
0, CODEC_ID_NONE,
mp3_write_header, mp3_write_header,
mp3_write_packet, mp3_write_packet,
mp3_write_trailer, mp3_write_trailer,

20
libavformat/raw.c
View File

@ -463,7 +463,7 @@ AVOutputFormat flac_muxer = {
"flac", "flac",
0, 0,
CODEC_ID_FLAC, CODEC_ID_FLAC,
0, CODEC_ID_NONE,
flac_write_header, flac_write_header,
raw_write_packet, raw_write_packet,
.flags= AVFMT_NOTIMESTAMPS, .flags= AVFMT_NOTIMESTAMPS,
@ -493,7 +493,7 @@ AVOutputFormat ac3_muxer = {
"ac3", "ac3",
0, 0,
CODEC_ID_AC3, CODEC_ID_AC3,
0, CODEC_ID_NONE,
NULL, NULL,
raw_write_packet, raw_write_packet,
.flags= AVFMT_NOTIMESTAMPS, .flags= AVFMT_NOTIMESTAMPS,
@ -506,7 +506,7 @@ AVOutputFormat dts_muxer = {
"dts", "dts",
0, 0,
CODEC_ID_DTS, CODEC_ID_DTS,
0, CODEC_ID_NONE,
NULL, NULL,
raw_write_packet, raw_write_packet,
.flags= AVFMT_NOTIMESTAMPS, .flags= AVFMT_NOTIMESTAMPS,
@ -533,7 +533,7 @@ AVOutputFormat dirac_muxer = {
NULL, NULL,
"drc", "drc",
0, 0,
0, CODEC_ID_NONE,
CODEC_ID_DIRAC, CODEC_ID_DIRAC,
NULL, NULL,
raw_write_packet, raw_write_packet,
@ -615,7 +615,7 @@ AVOutputFormat h261_muxer = {
"video/x-h261", "video/x-h261",
"h261", "h261",
0, 0,
0, CODEC_ID_NONE,
CODEC_ID_H261, CODEC_ID_H261,
NULL, NULL,
raw_write_packet, raw_write_packet,
@ -643,7 +643,7 @@ AVOutputFormat h263_muxer = {
"video/x-h263", "video/x-h263",
"h263", "h263",
0, 0,
0, CODEC_ID_NONE,
CODEC_ID_H263, CODEC_ID_H263,
NULL, NULL,
raw_write_packet, raw_write_packet,
@ -726,7 +726,7 @@ AVOutputFormat mpeg1video_muxer = {
"video/x-mpeg", "video/x-mpeg",
"mpg,mpeg,m1v", "mpg,mpeg,m1v",
0, 0,
0, CODEC_ID_NONE,
CODEC_ID_MPEG1VIDEO, CODEC_ID_MPEG1VIDEO,
NULL, NULL,
raw_write_packet, raw_write_packet,
@ -741,7 +741,7 @@ AVOutputFormat mpeg2video_muxer = {
NULL, NULL,
"m2v", "m2v",
0, 0,
0, CODEC_ID_NONE,
CODEC_ID_MPEG2VIDEO, CODEC_ID_MPEG2VIDEO,
NULL, NULL,
raw_write_packet, raw_write_packet,
@ -782,7 +782,7 @@ AVOutputFormat mjpeg_muxer = {
"video/x-mjpeg", "video/x-mjpeg",
"mjpg,mjpeg", "mjpg,mjpeg",
0, 0,
0, CODEC_ID_NONE,
CODEC_ID_MJPEG, CODEC_ID_MJPEG,
NULL, NULL,
raw_write_packet, raw_write_packet,
@ -827,7 +827,7 @@ AVOutputFormat pcm_ ## name ## _muxer = {\
ext,\ ext,\
0,\ 0,\
codec,\ codec,\
0,\ CODEC_ID_NONE,\
NULL,\ NULL,\
raw_write_packet,\ raw_write_packet,\
.flags= AVFMT_NOTIMESTAMPS,\ .flags= AVFMT_NOTIMESTAMPS,\