From 8ae381fc769e64b4fd96bef2f75f148350a7c21b Mon Sep 17 00:00:00 2001
From: phintuka <phintuka>
Date: Mon, 4 Feb 2008 23:49:50 +0000
Subject: Use packet type macros

---
 tools/pes.c | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

(limited to 'tools/pes.c')

diff --git a/tools/pes.c b/tools/pes.c
index b2520340..2845bf07 100644
--- a/tools/pes.c
+++ b/tools/pes.c
@@ -4,7 +4,7 @@
  * See the main source file 'xineliboutput.c' for copyright information and
  * how to reach the author.
  *
- * $Id: pes.c,v 1.1 2008-02-04 23:46:08 phintuka Exp $
+ * $Id: pes.c,v 1.2 2008-02-04 23:49:50 phintuka Exp $
  *
  */
 
@@ -17,10 +17,7 @@
 int64_t pes_get_pts(const uint8_t *buf, int len)
 {
   /* assume mpeg2 pes header ... */
-
-  if ((VIDEO_STREAM == (buf[3] & ~VIDEO_STREAM_MASK)) ||
-      (AUDIO_STREAM == (buf[3] & ~AUDIO_STREAM_MASK)) ||
-      (PRIVATE_STREAM1 == buf[3])) {
+  if (IS_VIDEO_PACKET(buf) || IS_AUDIO_PACKET(buf)) {
       
     if ((buf[6] & 0xC0) != 0x80)
       return INT64_C(-1);
@@ -42,9 +39,7 @@ int64_t pes_get_pts(const uint8_t *buf, int len)
 
 int64_t pes_get_dts(const uint8_t *buf, int len)
 {
-  if ((VIDEO_STREAM == (buf[3] & ~VIDEO_STREAM_MASK)) ||
-      (AUDIO_STREAM == (buf[3] & ~AUDIO_STREAM_MASK)) ||
-      (PRIVATE_STREAM1 == buf[3])) {
+  if (IS_VIDEO_PACKET(buf) || IS_AUDIO_PACKET(buf)) {
       
     if ((buf[6] & 0xC0) != 0x80)
       return INT64_C(-1);
-- 
cgit v1.2.3