Mercurial > libavformat.hg
comparison utils.c @ 4206:c3102b189cb6 libavformat
Change semantic of CONFIG_*, HAVE_* and ARCH_*.
They are now always defined to either 0 or 1.
author | aurel |
---|---|
date | Tue, 13 Jan 2009 23:44:16 +0000 |
parents | d2093f4132df |
children | 44f4dca12784 |
comparison
equal
deleted
inserted
replaced
4205:41878938d030 | 4206:c3102b189cb6 |
---|---|
158 { | 158 { |
159 AVOutputFormat *fmt, *fmt_found; | 159 AVOutputFormat *fmt, *fmt_found; |
160 int score_max, score; | 160 int score_max, score; |
161 | 161 |
162 /* specific test for image sequences */ | 162 /* specific test for image sequences */ |
163 #ifdef CONFIG_IMAGE2_MUXER | 163 #if CONFIG_IMAGE2_MUXER |
164 if (!short_name && filename && | 164 if (!short_name && filename && |
165 av_filename_number_test(filename) && | 165 av_filename_number_test(filename) && |
166 av_guess_image2_codec(filename) != CODEC_ID_NONE) { | 166 av_guess_image2_codec(filename) != CODEC_ID_NONE) { |
167 return guess_format("image2", NULL, NULL); | 167 return guess_format("image2", NULL, NULL); |
168 } | 168 } |
212 enum CodecID av_guess_codec(AVOutputFormat *fmt, const char *short_name, | 212 enum CodecID av_guess_codec(AVOutputFormat *fmt, const char *short_name, |
213 const char *filename, const char *mime_type, enum CodecType type){ | 213 const char *filename, const char *mime_type, enum CodecType type){ |
214 if(type == CODEC_TYPE_VIDEO){ | 214 if(type == CODEC_TYPE_VIDEO){ |
215 enum CodecID codec_id= CODEC_ID_NONE; | 215 enum CodecID codec_id= CODEC_ID_NONE; |
216 | 216 |
217 #ifdef CONFIG_IMAGE2_MUXER | 217 #if CONFIG_IMAGE2_MUXER |
218 if(!strcmp(fmt->name, "image2") || !strcmp(fmt->name, "image2pipe")){ | 218 if(!strcmp(fmt->name, "image2") || !strcmp(fmt->name, "image2pipe")){ |
219 codec_id= av_guess_image2_codec(filename); | 219 codec_id= av_guess_image2_codec(filename); |
220 } | 220 } |
221 #endif | 221 #endif |
222 if(codec_id == CODEC_ID_NONE) | 222 if(codec_id == CODEC_ID_NONE) |