Mercurial > libavformat.hg
comparison utils.c @ 5950:f80cd2cf07e4 libavformat
Do not probe when the format is known.
Patch by Jean-Daniel Dupas devlists shadowlab org
| author | benoit |
|---|---|
| date | Tue, 13 Apr 2010 07:25:50 +0000 |
| parents | 88cce1b69115 |
| children | 178de7695c6c |
comparison
equal
deleted
inserted
replaced
| 5949:fcdf61a4a6ce | 5950:f80cd2cf07e4 |
|---|---|
| 557 goto fail; | 557 goto fail; |
| 558 } | 558 } |
| 559 if (buf_size > 0) { | 559 if (buf_size > 0) { |
| 560 url_setbufsize(pb, buf_size); | 560 url_setbufsize(pb, buf_size); |
| 561 } | 561 } |
| 562 if ((err = ff_probe_input_buffer(&pb, &fmt, filename, logctx, 0, logctx ? (*ic_ptr)->probesize : 0)) < 0) { | 562 if (!fmt && (err = ff_probe_input_buffer(&pb, &fmt, filename, logctx, 0, logctx ? (*ic_ptr)->probesize : 0)) < 0) { |
| 563 goto fail; | 563 goto fail; |
| 564 } | 564 } |
| 565 } | 565 } |
| 566 | 566 |
| 567 /* if still no format found, error */ | 567 /* if still no format found, error */ |