har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avr: use ff_pcm_read_packet()

Browse Source 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Paul B Mahol 2012-12-03 17:26:16 +00:00
parent 93dc8ed0a1
commit 15ab0393fd
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/Makefile
View File

@ -78,7 +78,7 @@ OBJS-$(CONFIG_AVI_DEMUXER) += avidec.o
OBJS-$(CONFIG_AVI_MUXER) += avienc.o OBJS-$(CONFIG_AVI_MUXER) += avienc.o
OBJS-$(CONFIG_AVISYNTH) += avisynth.o OBJS-$(CONFIG_AVISYNTH) += avisynth.o
OBJS-$(CONFIG_AVM2_MUXER) += swfenc.o swf.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_AVS_DEMUXER) += avs.o vocdec.o voc.o
OBJS-$(CONFIG_BETHSOFTVID_DEMUXER) += bethsoftvid.o OBJS-$(CONFIG_BETHSOFTVID_DEMUXER) += bethsoftvid.o
OBJS-$(CONFIG_BFI_DEMUXER) += bfi.o OBJS-$(CONFIG_BFI_DEMUXER) += bfi.o

5
libavformat/avr.c
View File

@ -22,7 +22,6 @@
#include "libavutil/intreadwrite.h" #include "libavutil/intreadwrite.h"
#include "avformat.h" #include "avformat.h"
#include "internal.h" #include "internal.h"
#include "rawdec.h"
#include "pcm.h" #include "pcm.h"
static int avr_probe(AVProbeData *p) static int avr_probe(AVProbeData *p)
@ -83,6 +82,8 @@ static int avr_read_header(AVFormatContext *s)
return AVERROR_PATCHWELCOME; return AVERROR_PATCHWELCOME;
} }
st->codec->block_align = bps * st->codec->channels / 8;
avpriv_set_pts_info(st, 64, 1, st->codec->sample_rate); avpriv_set_pts_info(st, 64, 1, st->codec->sample_rate);
return 0; return 0;
} }
@ -92,7 +93,7 @@ AVInputFormat ff_avr_demuxer = {
.long_name = NULL_IF_CONFIG_SMALL("AVR (Audio Visual Research)"), .long_name = NULL_IF_CONFIG_SMALL("AVR (Audio Visual Research)"),
.read_probe = avr_probe, .read_probe = avr_probe,
.read_header = avr_read_header, .read_header = avr_read_header,
.read_packet = ff_raw_read_partial_packet, .read_packet = ff_pcm_read_packet,
.read_seek = ff_pcm_read_seek, .read_seek = ff_pcm_read_seek,
.extensions = "avr", .extensions = "avr",
.flags = AVFMT_GENERIC_INDEX, .flags = AVFMT_GENERIC_INDEX,