[SCM] libav/experimental: mlpdec: Simplify no restart header seen error.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 01aaf092746728aeb5290b6a19c721a85c12427e
Author: Ramiro Polla <ramiro.polla at gmail.com>
Date:   Mon Mar 30 03:44:20 2009 +0000

    mlpdec: Simplify no restart header seen error.
    
    Originally committed as revision 18239 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/mlpdec.c b/libavcodec/mlpdec.c
index c053138..ef3071e 100644
--- a/libavcodec/mlpdec.c
+++ b/libavcodec/mlpdec.c
@@ -997,9 +997,6 @@ static int read_access_unit(AVCodecContext *avctx, void* data, int *data_size,
                 }
 
                 if (!s->restart_seen) {
-                    av_log(m->avctx, AV_LOG_ERROR,
-                           "No restart header present in substream %d.\n",
-                           substr);
                     goto next_substr;
                 }
 
@@ -1008,9 +1005,6 @@ static int read_access_unit(AVCodecContext *avctx, void* data, int *data_size,
             }
 
             if (!s->restart_seen) {
-                av_log(m->avctx, AV_LOG_ERROR,
-                       "No restart header present in substream %d.\n",
-                       substr);
                 goto next_substr;
             }
 
@@ -1055,6 +1049,11 @@ static int read_access_unit(AVCodecContext *avctx, void* data, int *data_size,
         }
 
 next_substr:
+        if (!s->restart_seen) {
+            av_log(m->avctx, AV_LOG_ERROR,
+                   "No restart header present in substream %d.\n", substr);
+        }
+
         buf += substream_data_len[substr];
     }
 

-- 
Libav/FFmpeg packaging