ffmpeg roll of source to mar 9 version...

patched-ffmpeg-mt/libavformat/mtv.c

 /*
  * mtv demuxer
  * Copyright (c) 2006 Reynaldo H. Verdejo Pinochet
  *
  * This file is part of FFmpeg.
  *
  * FFmpeg is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
@@ skipping 150 matching lines @@
     int ret;
 #if !HAVE_BIGENDIAN
     int i;
 #endif
 
     if((url_ftell(pb) - s->data_offset + mtv->img_segment_size) % mtv->full_segment_size)
     {
         url_fskip(pb, MTV_AUDIO_PADDING_SIZE);
 
         ret = av_get_packet(pb, pkt, MTV_ASUBCHUNK_DATA_SIZE);
-        if(ret != MTV_ASUBCHUNK_DATA_SIZE)
-            return AVERROR(EIO);
+        if(ret < 0)
+            return ret;
 
         pkt->pos -= MTV_AUDIO_PADDING_SIZE;
         pkt->stream_index = AUDIO_SID;
 
     }else
     {
         ret = av_get_packet(pb, pkt, mtv->img_segment_size);
-        if(ret != mtv->img_segment_size)
-            return AVERROR(EIO);
+        if(ret < 0)
+            return ret;
 
 #if !HAVE_BIGENDIAN
 
         /* pkt->data is GGGRRRR BBBBBGGG
          * and we need RRRRRGGG GGGBBBBB
          * for PIX_FMT_RGB565 so here we
          * just swap bytes as they come
          */
 
         for(i=0;i<mtv->img_segment_size/2;i++)
             *((uint16_t *)pkt->data+i) = bswap_16(*((uint16_t *)pkt->data+i));
 #endif
         pkt->stream_index = VIDEO_SID;
     }
 
     return ret;
 }
 
 AVInputFormat mtv_demuxer = {
     "MTV",
     NULL_IF_CONFIG_SMALL("MTV format"),
     sizeof(MTVDemuxContext),
     mtv_probe,
     mtv_read_header,
     mtv_read_packet,
 };