avformat/mxfdec: fix last packet timestamps
[ffmpeg.git] / libavformat / pvfdec.c
index 9d18256..c6652b9 100644 (file)
@@ -19,6 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavcodec/internal.h"
 #include "avformat.h"
 #include "internal.h"
 #include "pcm.h"
@@ -37,49 +38,39 @@ static int pvf_read_header(AVFormatContext *s)
     int bps, channels, sample_rate;
 
     avio_skip(s->pb, 5);
-    ff_get_line(s->pb, (char *)&buffer, 32);
+    ff_get_line(s->pb, buffer, sizeof(buffer));
     if (sscanf(buffer, "%d %d %d",
                &channels,
                &sample_rate,
                &bps) != 3)
         return AVERROR_INVALIDDATA;
 
-    if (channels <= 0 || bps <= 0 || sample_rate <= 0)
+    if (channels <= 0 || channels > FF_SANE_NB_CHANNELS ||
+        bps <= 0 || bps > INT_MAX / FF_SANE_NB_CHANNELS || sample_rate <= 0)
         return AVERROR_INVALIDDATA;
 
     st = avformat_new_stream(s, NULL);
     if (!st)
         return AVERROR(ENOMEM);
 
-    st->codec->codec_type  = AVMEDIA_TYPE_AUDIO;
-    st->codec->channels    = channels;
-    st->codec->sample_rate = sample_rate;
-    st->codec->codec_id    = ff_get_pcm_codec_id(bps, 0, 1, 0xFFFF);
-    st->codec->bits_per_coded_sample = bps;
-    st->codec->block_align = bps * st->codec->channels / 8;
+    st->codecpar->codec_type  = AVMEDIA_TYPE_AUDIO;
+    st->codecpar->channels    = channels;
+    st->codecpar->sample_rate = sample_rate;
+    st->codecpar->codec_id    = ff_get_pcm_codec_id(bps, 0, 1, 0xFFFF);
+    st->codecpar->bits_per_coded_sample = bps;
+    st->codecpar->block_align = bps * st->codecpar->channels / 8;
 
-    avpriv_set_pts_info(st, 64, 1, st->codec->sample_rate);
+    avpriv_set_pts_info(st, 64, 1, st->codecpar->sample_rate);
 
     return 0;
 }
 
-static int pvf_read_packet(AVFormatContext *s, AVPacket *pkt)
-{
-    int ret;
-
-    ret = av_get_packet(s->pb, pkt, 1024 * s->streams[0]->codec->block_align);
-    pkt->flags &= ~AV_PKT_FLAG_CORRUPT;
-    pkt->stream_index = 0;
-
-    return ret;
-}
-
 AVInputFormat ff_pvf_demuxer = {
     .name           = "pvf",
     .long_name      = NULL_IF_CONFIG_SMALL("PVF (Portable Voice Format)"),
     .read_probe     = pvf_probe,
     .read_header    = pvf_read_header,
-    .read_packet    = pvf_read_packet,
+    .read_packet    = ff_pcm_read_packet,
     .read_seek      = ff_pcm_read_seek,
     .extensions     = "pvf",
     .flags          = AVFMT_GENERIC_INDEX,