diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-07-31 01:04:28 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-07-31 01:28:31 +0400 |
commit | b5da7d4c1a7f08f89aece651a8f0f8c4963e5ad9 (patch) | |
tree | c5ade4afd26c2cbd5fd7d5442e044e688724269a /libavformat/pcmenc.c | |
parent | a85b4a5696787e36df8d7c805de8f86ea6365acb (diff) | |
parent | 6774247a9d7d15033c2b80118c03cb0cb10027df (diff) |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avformat: Drop pointless "format" from container long names
swscale: bury one more piece of inline asm under HAVE_INLINE_ASM.
wv: K&R formatting cosmetics
configure: Add missing descriptions to help output
h264_ps: declare array of colorspace strings on its own line.
fate: amix: specify f32 sample format for comparison
tiny_psnr: support 32-bit float samples
eamad/eatgq/eatqi: call special EA IDCT directly
eamad: remove use of MpegEncContext
mpegvideo: remove unnecessary inclusions of faandct.h
af_asyncts: avoid overflow in out_size with large delta values
af_asyncts: add first_pts option
Conflicts:
configure
libavcodec/eamad.c
libavcodec/h264_ps.c
libavformat/crcenc.c
libavformat/ffmdec.c
libavformat/ffmenc.c
libavformat/framecrcenc.c
libavformat/md5enc.c
libavformat/nutdec.c
libavformat/rawenc.c
libavformat/yuv4mpeg.c
tests/tiny_psnr.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/pcmenc.c')
-rw-r--r-- | libavformat/pcmenc.c | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/libavformat/pcmenc.c b/libavformat/pcmenc.c index 12e64b0fb8..b7877ddd32 100644 --- a/libavformat/pcmenc.c +++ b/libavformat/pcmenc.c @@ -33,62 +33,62 @@ AVOutputFormat ff_pcm_ ## name_ ## _muxer = { \ .flags = AVFMT_NOTIMESTAMPS, \ }; -PCMDEF(f64be, "PCM 64 bit floating-point big-endian format", +PCMDEF(f64be, "PCM 64-bit floating-point big-endian", NULL, CODEC_ID_PCM_F64BE) -PCMDEF(f64le, "PCM 64 bit floating-point little-endian format", +PCMDEF(f64le, "PCM 64-bit floating-point little-endian", NULL, CODEC_ID_PCM_F64LE) -PCMDEF(f32be, "PCM 32 bit floating-point big-endian format", +PCMDEF(f32be, "PCM 32-bit floating-point big-endian", NULL, CODEC_ID_PCM_F32BE) -PCMDEF(f32le, "PCM 32 bit floating-point little-endian format", +PCMDEF(f32le, "PCM 32-bit floating-point little-endian", NULL, CODEC_ID_PCM_F32LE) -PCMDEF(s32be, "PCM signed 32 bit big-endian format", +PCMDEF(s32be, "PCM signed 32-bit big-endian", NULL, CODEC_ID_PCM_S32BE) -PCMDEF(s32le, "PCM signed 32 bit little-endian format", +PCMDEF(s32le, "PCM signed 32-bit little-endian", NULL, CODEC_ID_PCM_S32LE) -PCMDEF(s24be, "PCM signed 24 bit big-endian format", +PCMDEF(s24be, "PCM signed 24-bit big-endian", NULL, CODEC_ID_PCM_S24BE) -PCMDEF(s24le, "PCM signed 24 bit little-endian format", +PCMDEF(s24le, "PCM signed 24-bit little-endian", NULL, CODEC_ID_PCM_S24LE) -PCMDEF(s16be, "PCM signed 16 bit big-endian format", +PCMDEF(s16be, "PCM signed 16-bit big-endian", AV_NE("sw", NULL), CODEC_ID_PCM_S16BE) -PCMDEF(s16le, "PCM signed 16 bit little-endian format", +PCMDEF(s16le, "PCM signed 16-bit little-endian", AV_NE(NULL, "sw"), CODEC_ID_PCM_S16LE) -PCMDEF(s8, "PCM signed 8 bit format", +PCMDEF(s8, "PCM signed 8-bit", "sb", CODEC_ID_PCM_S8) -PCMDEF(u32be, "PCM unsigned 32 bit big-endian format", +PCMDEF(u32be, "PCM unsigned 32-bit big-endian", NULL, CODEC_ID_PCM_U32BE) -PCMDEF(u32le, "PCM unsigned 32 bit little-endian format", +PCMDEF(u32le, "PCM unsigned 32-bit little-endian", NULL, CODEC_ID_PCM_U32LE) -PCMDEF(u24be, "PCM unsigned 24 bit big-endian format", +PCMDEF(u24be, "PCM unsigned 24-bit big-endian", NULL, CODEC_ID_PCM_U24BE) -PCMDEF(u24le, "PCM unsigned 24 bit little-endian format", +PCMDEF(u24le, "PCM unsigned 24-bit little-endian", NULL, CODEC_ID_PCM_U24LE) -PCMDEF(u16be, "PCM unsigned 16 bit big-endian format", +PCMDEF(u16be, "PCM unsigned 16-bit big-endian", AV_NE("uw", NULL), CODEC_ID_PCM_U16BE) -PCMDEF(u16le, "PCM unsigned 16 bit little-endian format", +PCMDEF(u16le, "PCM unsigned 16-bit little-endian", AV_NE(NULL, "uw"), CODEC_ID_PCM_U16LE) -PCMDEF(u8, "PCM unsigned 8 bit format", +PCMDEF(u8, "PCM unsigned 8-bit", "ub", CODEC_ID_PCM_U8) -PCMDEF(alaw, "PCM A-law format", +PCMDEF(alaw, "PCM A-law", "al", CODEC_ID_PCM_ALAW) -PCMDEF(mulaw, "PCM mu-law format", +PCMDEF(mulaw, "PCM mu-law", "ul", CODEC_ID_PCM_MULAW) |