comparison utils.c @ 2785:d3b3cfb538d8 libavformat

Suppress the "redirector hack" from libavformat/utils.c:av_open_input_stream(), and implement the redirector format more properly.
author lucabe
date Thu, 29 Nov 2007 08:35:05 +0000
parents d52c718e83f9
children 173b5cb7efde
comparison
equal deleted inserted replaced
2784:7046ab98056e 2785:d3b3cfb538d8
462 if (!fmt) { 462 if (!fmt) {
463 err = AVERROR_NOFMT; 463 err = AVERROR_NOFMT;
464 goto fail; 464 goto fail;
465 } 465 }
466 466
467 /* XXX: suppress this hack for redirectors */
468 #ifdef CONFIG_REDIR_DEMUXER
469 if (!strcmp(fmt->name, "redir")) {
470 int redir_open(AVFormatContext **ic_ptr, ByteIOContext *f);
471 err = redir_open(ic_ptr, pb);
472 url_fclose(pb);
473 return err;
474 }
475 #endif
476
477 /* check filename in case of an image number is expected */ 467 /* check filename in case of an image number is expected */
478 if (fmt->flags & AVFMT_NEEDNUMBER) { 468 if (fmt->flags & AVFMT_NEEDNUMBER) {
479 if (!av_filename_number_test(filename)) { 469 if (!av_filename_number_test(filename)) {
480 err = AVERROR_NUMEXPECTED; 470 err = AVERROR_NUMEXPECTED;
481 goto fail; 471 goto fail;