diff options
author | Michael Roitzsch <mroi@users.sourceforge.net> | 2003-02-27 22:26:48 +0000 |
---|---|---|
committer | Michael Roitzsch <mroi@users.sourceforge.net> | 2003-02-27 22:26:48 +0000 |
commit | e7c21c4337e55691a04578c80e1a76c74034e4eb (patch) | |
tree | 42a81e7601a473186fff03b439224533859dff34 /src | |
parent | 41a82fa9824136addf4c332de5d18f6c50d39926 (diff) | |
download | xine-lib-e7c21c4337e55691a04578c80e1a76c74034e4eb.tar.gz xine-lib-e7c21c4337e55691a04578c80e1a76c74034e4eb.tar.bz2 |
we should call open_ac3_file() for METHOD_BY_EXTENSION as well, because it
initializes the demuxer's info from the file
CVS patchset: 4298
CVS date: 2003/02/27 22:26:48
Diffstat (limited to 'src')
-rw-r--r-- | src/demuxers/demux_ac3.c | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/src/demuxers/demux_ac3.c b/src/demuxers/demux_ac3.c index 3ca64277b..701c694e0 100644 --- a/src/demuxers/demux_ac3.c +++ b/src/demuxers/demux_ac3.c @@ -21,7 +21,7 @@ * This demuxer detects raw AC3 data in a file and shovels AC3 data * directly to the AC3 decoder. * - * $Id: demux_ac3.c,v 1.4 2003/02/08 16:01:09 tmmm Exp $ + * $Id: demux_ac3.c,v 1.5 2003/02/27 22:26:48 mroi Exp $ * */ @@ -323,16 +323,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str switch (stream->content_detection_method) { - case METHOD_BY_CONTENT: - case METHOD_EXPLICIT: - - if (!open_ac3_file(this)) { - free (this); - return NULL; - } - - break; - case METHOD_BY_EXTENSION: { char *ending, *mrl; @@ -351,8 +341,19 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str } } + /* falling through is intended */ + + case METHOD_BY_CONTENT: + case METHOD_EXPLICIT: + + if (!open_ac3_file(this)) { + free (this); + return NULL; + } + break; + default: free (this); return NULL; |