head	1.2;
access;
symbols
	pkgsrc-2015Q3:1.1.0.24
	pkgsrc-2015Q3-base:1.1
	pkgsrc-2015Q2:1.1.0.22
	pkgsrc-2015Q2-base:1.1
	pkgsrc-2015Q1:1.1.0.20
	pkgsrc-2015Q1-base:1.1
	pkgsrc-2014Q4:1.1.0.18
	pkgsrc-2014Q4-base:1.1
	pkgsrc-2014Q3:1.1.0.16
	pkgsrc-2014Q3-base:1.1
	pkgsrc-2014Q2:1.1.0.14
	pkgsrc-2014Q2-base:1.1
	pkgsrc-2014Q1:1.1.0.12
	pkgsrc-2014Q1-base:1.1
	pkgsrc-2013Q4:1.1.0.10
	pkgsrc-2013Q4-base:1.1
	pkgsrc-2013Q3:1.1.0.8
	pkgsrc-2013Q3-base:1.1
	pkgsrc-2013Q2:1.1.0.6
	pkgsrc-2013Q2-base:1.1
	pkgsrc-2013Q1:1.1.0.4
	pkgsrc-2013Q1-base:1.1
	pkgsrc-2012Q4:1.1.0.2
	pkgsrc-2012Q4-base:1.1;
locks; strict;
comment	@# @;


1.2
date	2015.10.25.10.53.18;	author wiz;	state dead;
branches;
next	1.1;
commitid	lsG7QXEk8Q3RKtGy;

1.1
date	2012.10.11.15.29.39;	author drochner;	state Exp;
branches;
next	;


desc
@@


1.2
log
@Finish move of vlc2 to vlc20.
@
text
@$NetBSD: patch-ba,v 1.1 2012/10/11 15:29:39 drochner Exp $

partly fixed by upstream commit 59997ad65b64e43f418464c37373b9b57cf1f5f9
(it is really a bug, not just killing a warning)

--- modules/demux/mp4/libmp4.c.orig	2012-04-27 17:14:57.000000000 +0000
+++ modules/demux/mp4/libmp4.c
@@@@ -1267,7 +1267,7 @@@@ static int MP4_ReadBox_dvc1( stream_t *p
     p_dvc1 = p_box->data.p_dvc1;
 
     MP4_GET1BYTE( p_dvc1->i_profile_level ); /* profile is on 4bits, level 3bits */
-    if( p_dvc1->i_profile_level & 0xf0 >> 4 != 0x06 )
+    if( (p_dvc1->i_profile_level & 0xf0) >> 4 != 0x06 )
     {
         msg_Warn( p_stream, "unsupported VC-1 profile, please report" );
         MP4_READBOX_EXIT( 0 );
@@@@ -1286,7 +1286,7 @@@@ static int MP4_ReadBox_dvc1( stream_t *p
 #ifdef MP4_VERBOSE
     msg_Dbg( p_stream,
              "read box: \"dvc1\" profile=0x%x level=0x%x",
-             p_dvc1->i_profile_level & 0xf0 >> 4, p_dvc1->i_profile_level & 0xe > 1 );
+             (p_dvc1->i_profile_level & 0xf0) >> 4, (p_dvc1->i_profile_level & 0xe) >> 1 );
 #endif
 
     MP4_READBOX_EXIT( 1 );
@


1.1
log
@fix bitfield extraction (wrong operator precedence)
@
text
@d1 1
a1 1
$NetBSD$
@