Merge remote-tracking branch 'qatar/master'
[ffmpeg.git] / libavformat / pcmdec.c
index 5ed572b..30f69d3 100644 (file)
 
 #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);
@@ -61,7 +61,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];
@@ -84,8 +84,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 = 44100}, 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 = 44100}, 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 },
 };
 
@@ -99,9 +99,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,                                  \