[FFmpeg-cvslog] oggdec: simplify ogg_probe

Clément Bœsch git at videolan.org
Fri May 13 04:45:57 CEST 2011


ffmpeg | branch: master | Clément Bœsch <ubitux at gmail.com> | Wed May 11 20:43:30 2011 +0200| [f95257d27c91c7e1981e1f6a53c7e9217a3fae98] | committer: Diego Biurrun

oggdec: simplify ogg_probe

Signed-off-by: Diego Biurrun <diego at biurrun.de>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f95257d27c91c7e1981e1f6a53c7e9217a3fae98
---

 libavformat/oggdec.c |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/libavformat/oggdec.c b/libavformat/oggdec.c
index 07969c8..bbd299d 100644
--- a/libavformat/oggdec.c
+++ b/libavformat/oggdec.c
@@ -642,12 +642,9 @@ static int ogg_read_seek(AVFormatContext *s, int stream_index, int64_t timestamp
 
 static int ogg_probe(AVProbeData *p)
 {
-    if (p->buf[0] == 'O' && p->buf[1] == 'g' &&
-        p->buf[2] == 'g' && p->buf[3] == 'S' &&
-        p->buf[4] == 0x0 && p->buf[5] <= 0x7 )
+    if (!memcmp("OggS", p->buf, 5) && p->buf[5] <= 0x7)
         return AVPROBE_SCORE_MAX;
-    else
-        return 0;
+    return 0;
 }
 
 AVInputFormat ff_ogg_demuxer = {



More information about the ffmpeg-cvslog mailing list