Revision 61573bf1 libavformat/utils.c

View differences:

libavformat/utils.c
200 200
    return !strcasecmp(name, names);
201 201
}
202 202

  
203
#if FF_API_GUESS_FORMAT
204
AVOutputFormat *guess_format(const char *short_name, const char *filename,
205
                             const char *mime_type)
206
{
207
    return av_guess_format(short_name, filename, mime_type);
208
}
209
#endif
210

  
211 203
AVOutputFormat *av_guess_format(const char *short_name, const char *filename,
212 204
                                const char *mime_type)
213 205
{
......
243 235
    return fmt_found;
244 236
}
245 237

  
246
#if FF_API_GUESS_FORMAT
247
AVOutputFormat *guess_stream_format(const char *short_name, const char *filename,
248
                             const char *mime_type)
249
{
250
    AVOutputFormat *fmt = av_guess_format(short_name, filename, mime_type);
251

  
252
    if (fmt) {
253
        AVOutputFormat *stream_fmt;
254
        char stream_format_name[64];
255

  
256
        snprintf(stream_format_name, sizeof(stream_format_name), "%s_stream", fmt->name);
257
        stream_fmt = av_guess_format(stream_format_name, NULL, NULL);
258

  
259
        if (stream_fmt)
260
            fmt = stream_fmt;
261
    }
262

  
263
    return fmt;
264
}
265
#endif
266

  
267 238
enum CodecID av_guess_codec(AVOutputFormat *fmt, const char *short_name,
268 239
                            const char *filename, const char *mime_type, enum AVMediaType type){
269 240
    if(type == AVMEDIA_TYPE_VIDEO){

Also available in: Unified diff