[SCM] libav/experimental: handle init error in ffmpeg12

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 288daa8452c7c5191bf28d93a84cb70fa9f10d66
Author: Arpi <arpi at thot.banki.hu>
Date:   Sat Nov 2 01:43:19 2002 +0000

    handle init error in ffmpeg12
    
    Originally committed as revision 1141 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c
index 7201e54..8cf31b5 100644
--- a/libavcodec/mpeg12.c
+++ b/libavcodec/mpeg12.c
@@ -1582,7 +1582,7 @@ static int mpeg_decode_slice(AVCodecContext *avctx,
     if (s->first_slice) {
         s->first_slice = 0;
         if(MPV_frame_start(s, avctx) < 0)
-            return -1;
+            return -2;
     }
 
     init_get_bits(&s->gb, buf, buf_size);
@@ -1928,8 +1928,9 @@ static int mpeg_decode_frame(AVCodecContext *avctx,
                             }         
                             *data_size = sizeof(AVPicture);
                             goto the_end;
-                        }else if(ret==-1){
+                        }else if(ret<0){
                             printf("Error while decoding slice\n");
+			    if(ret<-1) return -1;
                         }
                     }
                     break;

-- 
Libav/FFmpeg packaging