[SCM] libav/experimental: dont mess with ByteIOContext internal variables (fixes showdown2.mov)

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 143bf7d7c30c10033c4d90ab6c4b497582f46653
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Thu Oct 19 10:05:36 2006 +0000

    dont mess with ByteIOContext internal variables (fixes showdown2.mov)
    
    Originally committed as revision 6733 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/mov.c b/libavformat/mov.c
index 09d8cd7..f02f8c8 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -1348,7 +1348,7 @@ static int mov_read_wide(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
 #ifdef CONFIG_ZLIB
 static int null_read_packet(void *opaque, uint8_t *buf, int buf_size)
 {
-    return -1;
+    return buf_size;
 }
 
 static int mov_read_cmov(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
@@ -1385,7 +1385,6 @@ static int mov_read_cmov(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
         return -1;
     if(init_put_byte(&ctx, moov_data, moov_len, 0, NULL, null_read_packet, NULL, NULL) != 0)
         return -1;
-    ctx.buf_end = ctx.buffer + moov_len;
     atom.type = MKTAG( 'm', 'o', 'o', 'v' );
     atom.offset = 0;
     atom.size = moov_len;

-- 
Libav/FFmpeg packaging