diff --git a/libavformat/Makefile b/libavformat/Makefile
index de1a05ba48..1099099a79 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -78,7 +78,7 @@ OBJS-$(CONFIG_AVI_DEMUXER)               += avidec.o
 OBJS-$(CONFIG_AVI_MUXER)                 += avienc.o
 OBJS-$(CONFIG_AVISYNTH)                  += avisynth.o
 OBJS-$(CONFIG_AVM2_MUXER)                += swfenc.o swf.o
-OBJS-$(CONFIG_AVR_DEMUXER)               += avr.o rawdec.o pcm.o
+OBJS-$(CONFIG_AVR_DEMUXER)               += avr.o pcm.o
 OBJS-$(CONFIG_AVS_DEMUXER)               += avs.o vocdec.o voc.o
 OBJS-$(CONFIG_BETHSOFTVID_DEMUXER)       += bethsoftvid.o
 OBJS-$(CONFIG_BFI_DEMUXER)               += bfi.o
diff --git a/libavformat/avr.c b/libavformat/avr.c
index d3b23dbd59..71a107c3ac 100644
--- a/libavformat/avr.c
+++ b/libavformat/avr.c
@@ -22,7 +22,6 @@
 #include "libavutil/intreadwrite.h"
 #include "avformat.h"
 #include "internal.h"
-#include "rawdec.h"
 #include "pcm.h"
 
 static int avr_probe(AVProbeData *p)
@@ -83,6 +82,8 @@ static int avr_read_header(AVFormatContext *s)
         return AVERROR_PATCHWELCOME;
     }
 
+    st->codec->block_align = bps * st->codec->channels / 8;
+
     avpriv_set_pts_info(st, 64, 1, st->codec->sample_rate);
     return 0;
 }
@@ -92,7 +93,7 @@ AVInputFormat ff_avr_demuxer = {
     .long_name      = NULL_IF_CONFIG_SMALL("AVR (Audio Visual Research)"),
     .read_probe     = avr_probe,
     .read_header    = avr_read_header,
-    .read_packet    = ff_raw_read_partial_packet,
+    .read_packet    = ff_pcm_read_packet,
     .read_seek      = ff_pcm_read_seek,
     .extensions     = "avr",
     .flags          = AVFMT_GENERIC_INDEX,