ffmpeg roll of source to mar 9 version...

patched-ffmpeg-mt/libavformat/dsicin.c

 /*
  * Delphine Software International CIN File Demuxer
  * Copyright (c) 2006 Gregory Montoir (cyx@users.sourceforge.net)
  *
  * 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 144 matching lines @@
 
     return 0;
 }
 
 static int cin_read_packet(AVFormatContext *s, AVPacket *pkt)
 {
     CinDemuxContext *cin = s->priv_data;
     ByteIOContext *pb = s->pb;
     CinFrameHeader *hdr = &cin->frame_header;
     int rc, palette_type, pkt_size;
+    int ret;
 
     if (cin->audio_buffer_size == 0) {
         rc = cin_read_frame_header(cin, pb);
         if (rc)
             return rc;
 
         if ((int16_t)hdr->pal_colors_count < 0) {
             hdr->pal_colors_count = -(int16_t)hdr->pal_colors_count;
             palette_type = 1;
         } else {
             palette_type = 0;
         }
 
         /* palette and video packet */
         pkt_size = (palette_type + 3) * hdr->pal_colors_count + hdr->video_frame_size;
 
-        if (av_new_packet(pkt, 4 + pkt_size))
-            return AVERROR(ENOMEM);
+        ret = av_new_packet(pkt, 4 + pkt_size);
+        if (ret < 0)
+            return ret;
 
         pkt->stream_index = cin->video_stream_index;
         pkt->pts = cin->video_stream_pts++;
 
         pkt->data[0] = palette_type;
         pkt->data[1] = hdr->pal_colors_count & 0xFF;
         pkt->data[2] = hdr->pal_colors_count >> 8;
         pkt->data[3] = hdr->video_frame_type;
 
-        if (get_buffer(pb, &pkt->data[4], pkt_size) != pkt_size)
-            return AVERROR(EIO);
+        ret = get_buffer(pb, &pkt->data[4], pkt_size);
+        if (ret < 0) {
+            av_free_packet(pkt);
+            return ret;
+        }
+        if (ret < pkt_size)
+            av_shrink_packet(pkt, 4 + ret);
 
         /* sound buffer will be processed on next read_packet() call */
         cin->audio_buffer_size = hdr->audio_frame_size;
         return 0;
     }
 
     /* audio packet */
-    if (av_new_packet(pkt, cin->audio_buffer_size))
-        return AVERROR(ENOMEM);
+    ret = av_get_packet(pb, pkt, cin->audio_buffer_size);
+    if (ret < 0)
+        return ret;
 
     pkt->stream_index = cin->audio_stream_index;
     pkt->pts = cin->audio_stream_pts;
     cin->audio_stream_pts += cin->audio_buffer_size * 2 / cin->file_header.audio_frame_size;
-
-    if (get_buffer(pb, pkt->data, cin->audio_buffer_size) != cin->audio_buffer_size)
-        return AVERROR(EIO);
-
     cin->audio_buffer_size = 0;
     return 0;
 }
 
 AVInputFormat dsicin_demuxer = {
     "dsicin",
     NULL_IF_CONFIG_SMALL("Delphine Software International CIN format"),
     sizeof(CinDemuxContext),
     cin_probe,
     cin_read_header,
     cin_read_packet,
 };