[SCM] libav/experimental: mlpdec: Restart header sync must be 0x31ea for MLP.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 46958efe97b53ee56725d2f03555e06dbead5e30
Author: Ramiro Polla <ramiro.polla at gmail.com>
Date:   Tue Apr 21 21:57:23 2009 +0000

    mlpdec: Restart header sync must be 0x31ea for MLP.
    
    Originally committed as revision 18648 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/mlpdec.c b/libavcodec/mlpdec.c
index bf490ab..4932960 100644
--- a/libavcodec/mlpdec.c
+++ b/libavcodec/mlpdec.c
@@ -337,13 +337,14 @@ static int read_restart_header(MLPDecodeContext *m, GetBitContext *gbp,
     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 */
 

-- 
Libav/FFmpeg packaging