Mercurial > mplayer.hg
diff libmpdemux/demuxer.c @ 35448:f4828b517f4a
Fix scary "BUG! Invalid demuxer type ..." message
when using -audiofile or -subfile.
author | reimar |
---|---|
date | Fri, 30 Nov 2012 22:12:17 +0000 |
parents | d6305a78a11e |
children | 07b1f01495ee |
line wrap: on
line diff
--- a/libmpdemux/demuxer.c Fri Nov 30 21:31:14 2012 +0000 +++ b/libmpdemux/demuxer.c Fri Nov 30 22:12:17 2012 +0000 @@ -108,6 +108,9 @@ extern const demuxer_desc_t demuxer_desc_nut; extern const demuxer_desc_t demuxer_desc_mng; +// never add this to the list +extern const demuxer_desc_t demuxer_desc_demuxers; + /* Please do not add any new demuxers here. If you want to implement a new * demuxer, add it to libavformat, except for wrappers around external * libraries and demuxers requiring binary support. */ @@ -214,6 +217,8 @@ static const demuxer_desc_t *get_demuxer_desc_from_type(int file_format) { int i; + if (file_format == DEMUXER_TYPE_DEMUXERS) + return &demuxer_desc_demuxers; for (i = 0; demuxer_list[i]; i++) if (file_format == demuxer_list[i]->type)