[FFmpeg-cvslog] r18648 - trunk/libavcodec/mlpdec.c

[ramiro]

Author: ramiro
Date: Tue Apr 21 23:57:23 2009
New Revision: 18648

Log:
mlpdec: Restart header sync must be 0x31ea for MLP.

Modified:
   trunk/libavcodec/mlpdec.c

Modified: trunk/libavcodec/mlpdec.c
==============================================================================
--- trunk/libavcodec/mlpdec.c	Tue Apr 21 23:51:01 2009	(r18647)
+++ trunk/libavcodec/mlpdec.c	Tue Apr 21 23:57:23 2009	(r18648)
@@ -337,13 +337,14 @@ static int read_restart_header(MLPDecode
     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 */