aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/au.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-01-11 06:10:31 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-01-11 15:18:58 +0100
commit2e230cf1b555ba3ade7d976bb2f4e8ed5034e6ac (patch)
treeb019609fe3c0b9d10a940d365d98b5106a361577 /libavformat/au.c
parentf137d5763dbaf352bef6453ac0dcc16c1248137c (diff)
downloadandroid_external_ffmpeg-2e230cf1b555ba3ade7d976bb2f4e8ed5034e6ac.tar.gz
android_external_ffmpeg-2e230cf1b555ba3ade7d976bb2f4e8ed5034e6ac.tar.bz2
android_external_ffmpeg-2e230cf1b555ba3ade7d976bb2f4e8ed5034e6ac.zip
au: switch to ff_pcm_read_packet() again, after the merge
This fixes G722 durations Suggested-by: durandal_1707 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/au.c')
-rw-r--r--libavformat/au.c17
1 files changed, 1 insertions, 16 deletions
diff --git a/libavformat/au.c b/libavformat/au.c
index c190d57f61..b3a793d7ff 100644
--- a/libavformat/au.c
+++ b/libavformat/au.c
@@ -135,27 +135,12 @@ static int au_read_header(AVFormatContext *s)
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 = au_read_packet,
+ .read_packet = ff_pcm_read_packet,
.read_seek = ff_pcm_read_seek,
.codec_tag = (const AVCodecTag* const []) { codec_au_tags, 0 },
};