lavf: split wav muxer and demuxer into separate files.

[ffmpeg] / libavformat / pcmdec.c

diff --git a/libavformat/pcmdec.c b/libavformat/pcmdec.c
index b61fb33764eb20441859f42a4f639efca05ae255..ad478852979e6a5ad00a021a24a48f81ae673987 100644 (file)
--- a/libavformat/pcmdec.c
+++ b/libavformat/pcmdec.c
@@ -49,8 +49,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, {.dbl = 0}, 0, INT_MAX, AV_OPT_FLAG_DECODING_PARAM },
-    { "channels",    "", offsetof(RawAudioDemuxerContext, channels),    AV_OPT_TYPE_INT, {.dbl = 0}, 0, INT_MAX, AV_OPT_FLAG_DECODING_PARAM },
+    { "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 = 0}, 0, INT_MAX, AV_OPT_FLAG_DECODING_PARAM },
     { NULL },
 };
 
@@ -67,69 +67,69 @@ AVInputFormat ff_pcm_ ## name_ ## _demuxer = {              \
     .priv_data_size = sizeof(RawAudioDemuxerContext),       \
     .read_header    = ff_raw_read_header,                   \
     .read_packet    = raw_read_packet,                      \
-    .read_seek      = pcm_read_seek,                        \
+    .read_seek      = ff_pcm_read_seek,                     \
     .flags          = AVFMT_GENERIC_INDEX,                  \
     .extensions     = ext,                                  \
-    .value          = codec,                                \
+    .raw_codec_id   = codec,                                \
     .priv_class     = &name_ ## _demuxer_class,             \
 };
 
-PCMDEF(f64be, "PCM 64 bit floating-point big-endian format",
-       NULL, CODEC_ID_PCM_F64BE)
+PCMDEF(f64be, "PCM 64-bit floating-point big-endian",
+       NULL, AV_CODEC_ID_PCM_F64BE)
 
-PCMDEF(f64le, "PCM 64 bit floating-point little-endian format",
-       NULL, CODEC_ID_PCM_F64LE)
+PCMDEF(f64le, "PCM 64-bit floating-point little-endian",
+       NULL, AV_CODEC_ID_PCM_F64LE)
 
-PCMDEF(f32be, "PCM 32 bit floating-point big-endian format",
-       NULL, CODEC_ID_PCM_F32BE)
+PCMDEF(f32be, "PCM 32-bit floating-point big-endian",
+       NULL, AV_CODEC_ID_PCM_F32BE)
 
-PCMDEF(f32le, "PCM 32 bit floating-point little-endian format",
-       NULL, CODEC_ID_PCM_F32LE)
+PCMDEF(f32le, "PCM 32-bit floating-point little-endian",
+       NULL, AV_CODEC_ID_PCM_F32LE)
 
-PCMDEF(s32be, "PCM signed 32 bit big-endian format",
-       NULL, CODEC_ID_PCM_S32BE)
+PCMDEF(s32be, "PCM signed 32-bit big-endian",
+       NULL, AV_CODEC_ID_PCM_S32BE)
 
-PCMDEF(s32le, "PCM signed 32 bit little-endian format",
-       NULL, CODEC_ID_PCM_S32LE)
+PCMDEF(s32le, "PCM signed 32-bit little-endian",
+       NULL, AV_CODEC_ID_PCM_S32LE)
 
-PCMDEF(s24be, "PCM signed 24 bit big-endian format",
-       NULL, CODEC_ID_PCM_S24BE)
+PCMDEF(s24be, "PCM signed 24-bit big-endian",
+       NULL, AV_CODEC_ID_PCM_S24BE)
 
-PCMDEF(s24le, "PCM signed 24 bit little-endian format",
-       NULL, CODEC_ID_PCM_S24LE)
+PCMDEF(s24le, "PCM signed 24-bit little-endian",
+       NULL, AV_CODEC_ID_PCM_S24LE)
 
-PCMDEF(s16be, "PCM signed 16 bit big-endian format",
-       AV_NE("sw", NULL), CODEC_ID_PCM_S16BE)
+PCMDEF(s16be, "PCM signed 16-bit big-endian",
+       AV_NE("sw", NULL), AV_CODEC_ID_PCM_S16BE)
 
-PCMDEF(s16le, "PCM signed 16 bit little-endian format",
-       AV_NE(NULL, "sw"), CODEC_ID_PCM_S16LE)
+PCMDEF(s16le, "PCM signed 16-bit little-endian",
+       AV_NE(NULL, "sw"), AV_CODEC_ID_PCM_S16LE)
 
-PCMDEF(s8, "PCM signed 8 bit format",
-       "sb", CODEC_ID_PCM_S8)
+PCMDEF(s8, "PCM signed 8-bit",
+       "sb", AV_CODEC_ID_PCM_S8)
 
-PCMDEF(u32be, "PCM unsigned 32 bit big-endian format",
-       NULL, CODEC_ID_PCM_U32BE)
+PCMDEF(u32be, "PCM unsigned 32-bit big-endian",
+       NULL, AV_CODEC_ID_PCM_U32BE)
 
-PCMDEF(u32le, "PCM unsigned 32 bit little-endian format",
-       NULL, CODEC_ID_PCM_U32LE)
+PCMDEF(u32le, "PCM unsigned 32-bit little-endian",
+       NULL, AV_CODEC_ID_PCM_U32LE)
 
-PCMDEF(u24be, "PCM unsigned 24 bit big-endian format",
-       NULL, CODEC_ID_PCM_U24BE)
+PCMDEF(u24be, "PCM unsigned 24-bit big-endian",
+       NULL, AV_CODEC_ID_PCM_U24BE)
 
-PCMDEF(u24le, "PCM unsigned 24 bit little-endian format",
-       NULL, CODEC_ID_PCM_U24LE)
+PCMDEF(u24le, "PCM unsigned 24-bit little-endian",
+       NULL, AV_CODEC_ID_PCM_U24LE)
 
-PCMDEF(u16be, "PCM unsigned 16 bit big-endian format",
-       AV_NE("uw", NULL), CODEC_ID_PCM_U16BE)
+PCMDEF(u16be, "PCM unsigned 16-bit big-endian",
+       AV_NE("uw", NULL), AV_CODEC_ID_PCM_U16BE)
 
-PCMDEF(u16le, "PCM unsigned 16 bit little-endian format",
-       AV_NE(NULL, "uw"), CODEC_ID_PCM_U16LE)
+PCMDEF(u16le, "PCM unsigned 16-bit little-endian",
+       AV_NE(NULL, "uw"), AV_CODEC_ID_PCM_U16LE)
 
-PCMDEF(u8, "PCM unsigned 8 bit format",
-       "ub", CODEC_ID_PCM_U8)
+PCMDEF(u8, "PCM unsigned 8-bit",
+       "ub", AV_CODEC_ID_PCM_U8)
 
-PCMDEF(alaw, "PCM A-law format",
-       "al", CODEC_ID_PCM_ALAW)
+PCMDEF(alaw, "PCM A-law",
+       "al", AV_CODEC_ID_PCM_ALAW)
 
-PCMDEF(mulaw, "PCM mu-law format",
-       "ul", CODEC_ID_PCM_MULAW)
+PCMDEF(mulaw, "PCM mu-law",
+       "ul", AV_CODEC_ID_PCM_MULAW)