From acac16b5c78366917d166d91ade01b713b9703e5 Mon Sep 17 00:00:00 2001 From: Paul B Mahol Date: Mon, 3 Dec 2012 17:37:06 +0000 Subject: soxdec: use ff_pcm_read_packet() Signed-off-by: Paul B Mahol --- libavformat/soxdec.c | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/libavformat/soxdec.c b/libavformat/soxdec.c index 4c951bbd73..159fd9a7a7 100644 --- a/libavformat/soxdec.c +++ b/libavformat/soxdec.c @@ -124,31 +124,11 @@ static int sox_read_header(AVFormatContext *s) return 0; } -#define SOX_SAMPLES 1024 - -static int sox_read_packet(AVFormatContext *s, - AVPacket *pkt) -{ - int ret, size; - - if (url_feof(s->pb)) - return AVERROR_EOF; - - size = SOX_SAMPLES*s->streams[0]->codec->block_align; - ret = av_get_packet(s->pb, pkt, size); - if (ret < 0) - return AVERROR(EIO); - pkt->flags &= ~AV_PKT_FLAG_CORRUPT; - pkt->stream_index = 0; - - return 0; -} - AVInputFormat ff_sox_demuxer = { .name = "sox", .long_name = NULL_IF_CONFIG_SMALL("SoX native"), .read_probe = sox_probe, .read_header = sox_read_header, - .read_packet = sox_read_packet, + .read_packet = ff_pcm_read_packet, .read_seek = ff_pcm_read_seek, }; -- cgit v1.2.3