[SCM] libav/experimental: return cleanup

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit effdc8ef2aba69423b02b3decd717b9272e43388
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Tue Oct 10 23:28:27 2006 +0000

    return cleanup
    
    Originally committed as revision 6632 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/amr.c b/libavformat/amr.c
index 94d737a..6faad12 100644
--- a/libavformat/amr.c
+++ b/libavformat/amr.c
@@ -48,7 +48,7 @@ static int amr_write_header(AVFormatContext *s)
     }
     else
     {
-        //This is an error!
+        return -1;
     }
     put_flush_packet(pb);
     return 0;
@@ -168,8 +168,6 @@ static int amr_read_packet(AVFormatContext *s,
             av_free_packet(pkt);
             return AVERROR_IO;
         }
-
-        return 0;
     }
     else if(enc->codec_id == CODEC_ID_AMR_WB)
     {
@@ -203,13 +201,12 @@ static int amr_read_packet(AVFormatContext *s,
             av_free_packet(pkt);
             return AVERROR_IO;
         }
-
-        return 0;
     }
     else
     {
-        return AVERROR_IO;
+        assert(0);
     }
+    return 0;
 }
 
 static int amr_read_close(AVFormatContext *s)

-- 
Libav/FFmpeg packaging