Merge commit 'c88d245c9866e48cb8a238b7564964c1fcf3315f'

* commit 'c88d245c9866e48cb8a238b7564964c1fcf3315f':
  au: use ff_raw_write_packet()
  au: set stream start time and packet durations

Conflicts:
	libavformat/au.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

1 files changed, 18 insertions, 1 deletions

diff --git a/libavformat/au.c b/libavformat/au.c
index 269a508bcc..928dc7a259 100644
--- a/libavformat/au.c
+++ b/libavformat/au.c
@@ -133,16 +133,33 @@ static int au_read_header(AVFormatContext *s)
     st->codec->block_align = FFMAX(bps * st->codec->channels / 8, 1);
     if (data_size != AU_UNKNOWN_SIZE)
     st->duration = (((int64_t)data_size)<<3) / (st->codec->channels * (int64_t)bps);
+
+    st->start_time = 0;
     avpriv_set_pts_info(st, 64, 1, rate);
     return 0;
 }
 
+static int au_read_packet(AVFormatContext *s,
+                          AVPacket *pkt)
+{
+    int ret;
+
+    ret = av_get_packet(s->pb, pkt, BLOCK_SIZE *
+                        s->streams[0]->codec->block_align);
+    if (ret < 0)
+        return ret;
+    pkt->stream_index = 0;
+    pkt->duration     = ret / s->streams[0]->codec->block_align;
+
+    return 0;
+}
+
 AVInputFormat ff_au_demuxer = {
     .name           = "au",
     .long_name      = NULL_IF_CONFIG_SMALL("Sun AU"),
     .read_probe     = au_probe,
     .read_header    = au_read_header,
-    .read_packet    = ff_pcm_read_packet,
+    .read_packet    = au_read_packet,
     .read_seek      = ff_pcm_read_seek,
     .codec_tag      = (const AVCodecTag* const []){ codec_au_tags, 0 },
 };