Mercurial > libavformat.hg
comparison utils.c @ 3536:231f0db9672f libavformat
Allow NULL for read_header in AVInputFormat. See discussion in "[PATCH] allow
empty params for av_open_input_stream()".
author | rbultje |
---|---|
date | Thu, 03 Jul 2008 12:10:54 +0000 |
parents | 3fb9221edfe9 |
children | f02643ff8be2 |
comparison
equal
deleted
inserted
replaced
3535:5e0191d9e713 | 3536:231f0db9672f |
---|---|
392 } | 392 } |
393 } else { | 393 } else { |
394 ic->priv_data = NULL; | 394 ic->priv_data = NULL; |
395 } | 395 } |
396 | 396 |
397 if (ic->iformat->read_header) { | |
397 err = ic->iformat->read_header(ic, ap); | 398 err = ic->iformat->read_header(ic, ap); |
398 if (err < 0) | 399 if (err < 0) |
399 goto fail; | 400 goto fail; |
401 } | |
400 | 402 |
401 if (pb && !ic->data_offset) | 403 if (pb && !ic->data_offset) |
402 ic->data_offset = url_ftell(ic->pb); | 404 ic->data_offset = url_ftell(ic->pb); |
403 | 405 |
404 *ic_ptr = ic; | 406 *ic_ptr = ic; |