aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/pcmenc.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-08-07 22:45:46 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-08-07 22:45:46 +0200
commit7a72695c05f12f21a62dc99fa64d1726fc11b236 (patch)
treee8f1a2813c4cd1fd8bd0ac5f764c7fd676ab85af /libavformat/pcmenc.c
parent49440853d0c1e740daee0e2df1e65d5e67b1ad6b (diff)
parent36ef5369ee9b336febc2c270f8718cec4476cb85 (diff)
downloadffmpeg-7a72695c05f12f21a62dc99fa64d1726fc11b236.tar.gz
Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'
* commit '36ef5369ee9b336febc2c270f8718cec4476cb85': Replace all CODEC_ID_* with AV_CODEC_ID_* lavc: add AV prefix to codec ids. Conflicts: doc/APIchanges doc/examples/decoding_encoding.c doc/examples/muxing.c ffmpeg.c ffprobe.c ffserver.c libavcodec/8svx.c libavcodec/avcodec.h libavcodec/dnxhd_parser.c libavcodec/dvdsubdec.c libavcodec/error_resilience.c libavcodec/h263dec.c libavcodec/libvorbisenc.c libavcodec/mjpeg_parser.c libavcodec/mjpegenc.c libavcodec/mpeg12.c libavcodec/mpeg4videodec.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/pcm.c libavcodec/r210dec.c libavcodec/utils.c libavcodec/v210dec.c libavcodec/version.h libavdevice/alsa-audio-dec.c libavdevice/bktr.c libavdevice/v4l2.c libavformat/asfdec.c libavformat/asfenc.c libavformat/avformat.h libavformat/avidec.c libavformat/caf.c libavformat/electronicarts.c libavformat/flacdec.c libavformat/flvdec.c libavformat/flvenc.c libavformat/framecrcenc.c libavformat/img2.c libavformat/img2dec.c libavformat/img2enc.c libavformat/ipmovie.c libavformat/isom.c libavformat/matroska.c libavformat/matroskadec.c libavformat/matroskaenc.c libavformat/mov.c libavformat/movenc.c libavformat/mp3dec.c libavformat/mpeg.c libavformat/mpegts.c libavformat/mxf.c libavformat/mxfdec.c libavformat/mxfenc.c libavformat/nsvdec.c libavformat/nut.c libavformat/oggenc.c libavformat/pmpdec.c libavformat/rawdec.c libavformat/rawenc.c libavformat/riff.c libavformat/sdp.c libavformat/utils.c libavformat/vocenc.c libavformat/wtv.c libavformat/xmv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/pcmenc.c')
-rw-r--r--libavformat/pcmenc.c42
1 files changed, 21 insertions, 21 deletions
diff --git a/libavformat/pcmenc.c b/libavformat/pcmenc.c
index b7877ddd32..3e4f308057 100644
--- a/libavformat/pcmenc.c
+++ b/libavformat/pcmenc.c
@@ -28,67 +28,67 @@ AVOutputFormat ff_pcm_ ## name_ ## _muxer = { \
.long_name = NULL_IF_CONFIG_SMALL(long_name_), \
.extensions = ext, \
.audio_codec = codec, \
- .video_codec = CODEC_ID_NONE, \
+ .video_codec = AV_CODEC_ID_NONE, \
.write_packet = ff_raw_write_packet, \
.flags = AVFMT_NOTIMESTAMPS, \
};
PCMDEF(f64be, "PCM 64-bit floating-point big-endian",
- NULL, CODEC_ID_PCM_F64BE)
+ NULL, AV_CODEC_ID_PCM_F64BE)
PCMDEF(f64le, "PCM 64-bit floating-point little-endian",
- NULL, CODEC_ID_PCM_F64LE)
+ NULL, AV_CODEC_ID_PCM_F64LE)
PCMDEF(f32be, "PCM 32-bit floating-point big-endian",
- NULL, CODEC_ID_PCM_F32BE)
+ NULL, AV_CODEC_ID_PCM_F32BE)
PCMDEF(f32le, "PCM 32-bit floating-point little-endian",
- NULL, CODEC_ID_PCM_F32LE)
+ NULL, AV_CODEC_ID_PCM_F32LE)
PCMDEF(s32be, "PCM signed 32-bit big-endian",
- NULL, CODEC_ID_PCM_S32BE)
+ NULL, AV_CODEC_ID_PCM_S32BE)
PCMDEF(s32le, "PCM signed 32-bit little-endian",
- NULL, CODEC_ID_PCM_S32LE)
+ NULL, AV_CODEC_ID_PCM_S32LE)
PCMDEF(s24be, "PCM signed 24-bit big-endian",
- NULL, CODEC_ID_PCM_S24BE)
+ NULL, AV_CODEC_ID_PCM_S24BE)
PCMDEF(s24le, "PCM signed 24-bit little-endian",
- NULL, CODEC_ID_PCM_S24LE)
+ NULL, AV_CODEC_ID_PCM_S24LE)
PCMDEF(s16be, "PCM signed 16-bit big-endian",
- AV_NE("sw", NULL), CODEC_ID_PCM_S16BE)
+ AV_NE("sw", NULL), AV_CODEC_ID_PCM_S16BE)
PCMDEF(s16le, "PCM signed 16-bit little-endian",
- AV_NE(NULL, "sw"), CODEC_ID_PCM_S16LE)
+ AV_NE(NULL, "sw"), AV_CODEC_ID_PCM_S16LE)
PCMDEF(s8, "PCM signed 8-bit",
- "sb", CODEC_ID_PCM_S8)
+ "sb", AV_CODEC_ID_PCM_S8)
PCMDEF(u32be, "PCM unsigned 32-bit big-endian",
- NULL, CODEC_ID_PCM_U32BE)
+ NULL, AV_CODEC_ID_PCM_U32BE)
PCMDEF(u32le, "PCM unsigned 32-bit little-endian",
- NULL, CODEC_ID_PCM_U32LE)
+ NULL, AV_CODEC_ID_PCM_U32LE)
PCMDEF(u24be, "PCM unsigned 24-bit big-endian",
- NULL, CODEC_ID_PCM_U24BE)
+ NULL, AV_CODEC_ID_PCM_U24BE)
PCMDEF(u24le, "PCM unsigned 24-bit little-endian",
- NULL, CODEC_ID_PCM_U24LE)
+ NULL, AV_CODEC_ID_PCM_U24LE)
PCMDEF(u16be, "PCM unsigned 16-bit big-endian",
- AV_NE("uw", NULL), CODEC_ID_PCM_U16BE)
+ AV_NE("uw", NULL), AV_CODEC_ID_PCM_U16BE)
PCMDEF(u16le, "PCM unsigned 16-bit little-endian",
- AV_NE(NULL, "uw"), CODEC_ID_PCM_U16LE)
+ AV_NE(NULL, "uw"), AV_CODEC_ID_PCM_U16LE)
PCMDEF(u8, "PCM unsigned 8-bit",
- "ub", CODEC_ID_PCM_U8)
+ "ub", AV_CODEC_ID_PCM_U8)
PCMDEF(alaw, "PCM A-law",
- "al", CODEC_ID_PCM_ALAW)
+ "al", AV_CODEC_ID_PCM_ALAW)
PCMDEF(mulaw, "PCM mu-law",
- "ul", CODEC_ID_PCM_MULAW)
+ "ul", AV_CODEC_ID_PCM_MULAW)