diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-12-13 13:56:22 +0100 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-12-13 13:56:22 +0100 |
| commit | 2052cae5590413e6d8e8603659f339d1b8f17575 (patch) | |
| tree | 3952b72c9deae6a1c74daf65c428f1c860bee2de /src | |
| parent | 76e10baaa5737af773128af60751625b569cabe6 (diff) | |
| download | xine-lib-2052cae5590413e6d8e8603659f339d1b8f17575.tar.gz xine-lib-2052cae5590413e6d8e8603659f339d1b8f17575.tar.bz2 | |
Replace four-bytes comparison with a ME_FOURCC comparison.
Diffstat (limited to 'src')
| -rw-r--r-- | src/combined/xine_ogg_demuxer.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/combined/xine_ogg_demuxer.c b/src/combined/xine_ogg_demuxer.c index 70cfc5846..bdaf73063 100644 --- a/src/combined/xine_ogg_demuxer.c +++ b/src/combined/xine_ogg_demuxer.c @@ -1931,16 +1931,12 @@ static int detect_ogg_content (int detection_method, demux_class_t *class_gen, switch (detection_method) { case METHOD_BY_CONTENT: { - uint8_t buf[4]; + uint32_t header; - if (_x_demux_read_header(input, buf, 4) != 4) + if (_x_demux_read_header(input, &header, 4) != 4) return 0; - if ((buf[0] == 'O') && (buf[1] == 'g') && (buf[2] == 'g') && - (buf[3] == 'S')) - return 1; - else - return 0; + return !!( header == ME_FOURCC('O', 'g', 'g', 'S') ); } case METHOD_BY_MRL: |