[FFmpeg-cvslog] pcm: change references to raw to pcm
Luca Barbato
git at videolan.org
Fri Oct 26 15:26:50 CEST 2012
ffmpeg | branch: master | Luca Barbato <lu_zero at gentoo.org> | Mon Jan 1 01:08:20 2001 +0100| [254056c4ab6161d687caf8e9b837571db76e60c6] | committer: Luca Barbato
pcm: change references to raw to pcm
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=254056c4ab6161d687caf8e9b837571db76e60c6
---
libavformat/pcmdec.c | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/libavformat/pcmdec.c b/libavformat/pcmdec.c
index de6f13e..716d8b7 100644
--- a/libavformat/pcmdec.c
+++ b/libavformat/pcmdec.c
@@ -27,15 +27,15 @@
#define RAW_SAMPLES 1024
-typedef struct RawAudioDemuxerContext {
+typedef struct PCMAudioDemuxerContext {
AVClass *class;
int sample_rate;
int channels;
-} RawAudioDemuxerContext;
+} PCMAudioDemuxerContext;
-static int raw_read_header(AVFormatContext *s)
+static int pcm_read_header(AVFormatContext *s)
{
- RawAudioDemuxerContext *s1 = s->priv_data;
+ PCMAudioDemuxerContext *s1 = s->priv_data;
AVStream *st;
st = avformat_new_stream(s, NULL);
@@ -60,7 +60,7 @@ static int raw_read_header(AVFormatContext *s)
return 0;
}
-static int raw_read_packet(AVFormatContext *s, AVPacket *pkt)
+static int pcm_read_packet(AVFormatContext *s, AVPacket *pkt)
{
int ret, size, bps;
// AVStream *st = s->streams[0];
@@ -82,8 +82,8 @@ static int raw_read_packet(AVFormatContext *s, AVPacket *pkt)
}
static const AVOption pcm_options[] = {
- { "sample_rate", "", offsetof(RawAudioDemuxerContext, sample_rate), AV_OPT_TYPE_INT, {.i64 = 0}, 0, INT_MAX, AV_OPT_FLAG_DECODING_PARAM },
- { "channels", "", offsetof(RawAudioDemuxerContext, channels), AV_OPT_TYPE_INT, {.i64 = 1}, 0, INT_MAX, AV_OPT_FLAG_DECODING_PARAM },
+ { "sample_rate", "", offsetof(PCMAudioDemuxerContext, sample_rate), AV_OPT_TYPE_INT, {.i64 = 0}, 0, INT_MAX, AV_OPT_FLAG_DECODING_PARAM },
+ { "channels", "", offsetof(PCMAudioDemuxerContext, channels), AV_OPT_TYPE_INT, {.i64 = 1}, 0, INT_MAX, AV_OPT_FLAG_DECODING_PARAM },
{ NULL },
};
@@ -97,9 +97,9 @@ static const AVClass name_ ## _demuxer_class = { \
AVInputFormat ff_pcm_ ## name_ ## _demuxer = { \
.name = #name_, \
.long_name = NULL_IF_CONFIG_SMALL(long_name_), \
- .priv_data_size = sizeof(RawAudioDemuxerContext), \
- .read_header = raw_read_header, \
- .read_packet = raw_read_packet, \
+ .priv_data_size = sizeof(PCMAudioDemuxerContext), \
+ .read_header = pcm_read_header, \
+ .read_packet = pcm_read_packet, \
.read_seek = ff_pcm_read_seek, \
.flags = AVFMT_GENERIC_INDEX, \
.extensions = ext, \
More information about the ffmpeg-cvslog
mailing list