# HG changeset patch
# User ramiro
# Date 1240351043 0
# Node ID dbb16aa52d4314fbfdca0b5889702dc9165cd6c4
# Parent  e885f6298a7a02898008a47682c5a0274122cbaa
mlpdec: Restart header sync must be 0x31ea for MLP.

diff -r e885f6298a7a -r dbb16aa52d43 mlpdec.c
--- a/mlpdec.c	Tue Apr 21 21:51:01 2009 +0000
+++ b/mlpdec.c	Tue Apr 21 21:57:23 2009 +0000
@@ -337,13 +337,14 @@
     int start_count = get_bits_count(gbp);
 
     sync_word = get_bits(gbp, 13);
+    s->noise_type = get_bits1(gbp);
 
-    if (sync_word != 0x31ea >> 1) {
+    if ((m->avctx->codec_id == CODEC_ID_MLP && s->noise_type) ||
+        sync_word != 0x31ea >> 1) {
         av_log(m->avctx, AV_LOG_ERROR,
                "restart header sync incorrect (got 0x%04x)\n", sync_word);
         return -1;
     }
-    s->noise_type = get_bits1(gbp);
 
     skip_bits(gbp, 16); /* Output timestamp */