diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-07 22:45:46 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-07 22:45:46 +0200 |
| commit | 7a72695c05f12f21a62dc99fa64d1726fc11b236 (patch) | |
| tree | e8f1a2813c4cd1fd8bd0ac5f764c7fd676ab85af /libavcodec/r210enc.c | |
| parent | 49440853d0c1e740daee0e2df1e65d5e67b1ad6b (diff) | |
| parent | 36ef5369ee9b336febc2c270f8718cec4476cb85 (diff) | |
| download | ffmpeg-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 'libavcodec/r210enc.c')
| -rw-r--r-- | libavcodec/r210enc.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/r210enc.c b/libavcodec/r210enc.c index 0a7dd332ba..9e209fdd0b 100644 --- a/libavcodec/r210enc.c +++ b/libavcodec/r210enc.c @@ -39,7 +39,7 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, { int i, j, ret; int aligned_width = FFALIGN(avctx->width, - avctx->codec_id == CODEC_ID_R10K ? 1 : 64); + avctx->codec_id == AV_CODEC_ID_R10K ? 1 : 64); int pad = (aligned_width - avctx->width) * 4; uint8_t *src_line; uint8_t *dst; @@ -60,11 +60,11 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, uint16_t r = *src++ >> 6; uint16_t g = *src++ >> 6; uint16_t b = *src++ >> 4; - if (avctx->codec_id == CODEC_ID_R210) + if (avctx->codec_id == AV_CODEC_ID_R210) pixel = (r << 20) | (g << 10) | b >> 2; else pixel = (r << 22) | (g << 12) | b; - if (avctx->codec_id == CODEC_ID_AVRP) + if (avctx->codec_id == AV_CODEC_ID_AVRP) bytestream_put_le32(&dst, pixel); else bytestream_put_be32(&dst, pixel); @@ -90,7 +90,7 @@ static av_cold int encode_close(AVCodecContext *avctx) AVCodec ff_r210_encoder = { .name = "r210", .type = AVMEDIA_TYPE_VIDEO, - .id = CODEC_ID_R210, + .id = AV_CODEC_ID_R210, .init = encode_init, .encode2 = encode_frame, .close = encode_close, @@ -102,7 +102,7 @@ AVCodec ff_r210_encoder = { AVCodec ff_r10k_encoder = { .name = "r10k", .type = AVMEDIA_TYPE_VIDEO, - .id = CODEC_ID_R10K, + .id = AV_CODEC_ID_R10K, .init = encode_init, .encode2 = encode_frame, .close = encode_close, @@ -114,7 +114,7 @@ AVCodec ff_r10k_encoder = { AVCodec ff_avrp_encoder = { .name = "avrp", .type = AVMEDIA_TYPE_VIDEO, - .id = CODEC_ID_AVRP, + .id = AV_CODEC_ID_AVRP, .init = encode_init, .encode2 = encode_frame, .close = encode_close, |