ffmpeg roll of source to mar 9 version...

patched-ffmpeg-mt/libavformat/r3d.c

 /*
  * R3D REDCODE demuxer
  * Copyright (c) 2008 Baptiste Coudurier <baptiste dot coudurier at gmail dot com>
  *
  * 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 194 matching lines @@
     url_fseek(s->pb, s->data_offset, SEEK_SET);
     return 0;
 }
 
 static int r3d_read_redv(AVFormatContext *s, AVPacket *pkt, Atom *atom)
 {
     AVStream *st = s->streams[0];
     int tmp, tmp2;
     uint64_t pos = url_ftell(s->pb);
     unsigned dts;
+    int ret;
 
     dts = get_be32(s->pb);
 
     tmp = get_be32(s->pb);
     dprintf(s, "frame num %d\n", tmp);
 
     tmp  = get_byte(s->pb); // major version
     tmp2 = get_byte(s->pb); // minor version
     dprintf(s, "version %d.%d\n", tmp, tmp2);
 
@@ skipping 11 matching lines @@
         dprintf(s, "width %d\n", tmp);
         tmp = get_be32(s->pb);
         dprintf(s, "height %d\n", tmp);
 
         tmp = get_be32(s->pb);
         dprintf(s, "metadata len %d\n", tmp);
     }
     tmp = atom->size - 8 - (url_ftell(s->pb) - pos);
     if (tmp < 0)
         return -1;
-
-    if (av_get_packet(s->pb, pkt, tmp) != tmp) {
+    ret = av_get_packet(s->pb, pkt, tmp);
+    if (ret < 0) {
         av_log(s, AV_LOG_ERROR, "error reading video packet\n");
         return -1;
     }
 
     pkt->stream_index = 0;
     pkt->dts = dts;
     if (st->codec->time_base.den)
         pkt->duration = (uint64_t)st->time_base.den*
             st->codec->time_base.num/st->codec->time_base.den;
     dprintf(s, "pkt dts %lld duration %d\n", pkt->dts, pkt->duration);
 
     return 0;
 }
 
 static int r3d_read_reda(AVFormatContext *s, AVPacket *pkt, Atom *atom)
 {
     AVStream *st = s->streams[1];
     int tmp, tmp2, samples, size;
     uint64_t pos = url_ftell(s->pb);
     unsigned dts;
+    int ret;
 
     dts = get_be32(s->pb);
 
     st->codec->sample_rate = get_be32(s->pb);
 
     samples = get_be32(s->pb);
 
     tmp = get_be32(s->pb);
     dprintf(s, "packet num %d\n", tmp);
 
     tmp = get_be16(s->pb); // unkown
     dprintf(s, "unknown %d\n", tmp);
 
     tmp  = get_byte(s->pb); // major version
     tmp2 = get_byte(s->pb); // minor version
     dprintf(s, "version %d.%d\n", tmp, tmp2);
 
     tmp = get_be32(s->pb); // unknown
     dprintf(s, "unknown %d\n", tmp);
 
     size = atom->size - 8 - (url_ftell(s->pb) - pos);
     if (size < 0)
         return -1;
-    if (av_get_packet(s->pb, pkt, size) != size) {
-        av_log(s, AV_LOG_ERROR, "error reading video packet\n");
-        return -1;
+    ret = av_get_packet(s->pb, pkt, size);
+    if (ret < 0) {
+        av_log(s, AV_LOG_ERROR, "error reading audio packet\n");
+        return ret;
     }
 
     pkt->stream_index = 1;
     pkt->dts = dts;
     pkt->duration = av_rescale(samples, st->time_base.den, st->codec->sample_rate);
     dprintf(s, "pkt dts %lld duration %d samples %d sample rate %d\n",
             pkt->dts, pkt->duration, samples, st->codec->sample_rate);
 
     return 0;
 }
@@ skipping 73 matching lines @@
 AVInputFormat r3d_demuxer = {
     "r3d",
     NULL_IF_CONFIG_SMALL("REDCODE R3D format"),
     sizeof(R3DContext),
     r3d_probe,
     r3d_read_header,
     r3d_read_packet,
     r3d_close,
     r3d_seek,
 };