diff options
| author | Daniel Caujolle-Bert <f1rmb@users.sourceforge.net> | 2002-02-01 13:01:57 +0000 |
|---|---|---|
| committer | Daniel Caujolle-Bert <f1rmb@users.sourceforge.net> | 2002-02-01 13:01:57 +0000 |
| commit | 3af6c170956b36981bf29feb604e5c2ce1666f31 (patch) | |
| tree | d923bcf15d19818feeeee0d5b8f44ae90cb305e6 | |
| parent | 479484807c301658b702885d7426ce543e33c420 (diff) | |
| download | xine-lib-3af6c170956b36981bf29feb604e5c2ce1666f31.tar.gz xine-lib-3af6c170956b36981bf29feb604e5c2ce1666f31.tar.bz2 | |
Fix a confusing ://mpeg1 ://mpeg2 handling.
CVS patchset: 1464
CVS date: 2002/02/01 13:01:57
| -rw-r--r-- | src/demuxers/demux_mpeg_block.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/demuxers/demux_mpeg_block.c b/src/demuxers/demux_mpeg_block.c index 3affa3368..0eb35d522 100644 --- a/src/demuxers/demux_mpeg_block.c +++ b/src/demuxers/demux_mpeg_block.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: demux_mpeg_block.c,v 1.74 2002/01/25 00:35:46 f1rmb Exp $ + * $Id: demux_mpeg_block.c,v 1.75 2002/02/01 13:01:57 f1rmb Exp $ * * demultiplexer for mpeg 1/2 program streams * @@ -970,8 +970,9 @@ static int demux_mpeg_block_open(demux_plugin_t *this_gen, while(*m == ' ' || *m == '\t') m++; - if((!strncmp(MRL, m, strlen(m))) - || ((!strncmp(MRL, m, strlen(m))) && (!strncmp((media + 3), "mpeg2", 5)))) { + if(((!strncmp(MRL, m, strlen(m))) && ((strncmp((media + 3), "mpeg2", 5)) && (strncmp((media + 3), "mpeg1", 5)))) + || (((!strncmp(MRL, m, strlen(m))) && (!strncmp((media + 3), "mpeg2", 5))) && + ((!strncmp(MRL, m, strlen(m))) && (strncmp((media + 3), "mpeg1", 5))))) { this->blocksize = 2048; demux_mpeg_block_accept_input(this, input); |