diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-08 00:45:46 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-08 00:45:46 +0400 |
| commit | 7a72695c05f12f21a62dc99fa64d1726fc11b236 (patch) | |
| tree | e8f1a2813c4cd1fd8bd0ac5f764c7fd676ab85af /libavcodec/bintext.c | |
| parent | 49440853d0c1e740daee0e2df1e65d5e67b1ad6b (diff) | |
| parent | 36ef5369ee9b336febc2c270f8718cec4476cb85 (diff) | |
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/bintext.c')
| -rw-r--r-- | libavcodec/bintext.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/bintext.c b/libavcodec/bintext.c index d0b6cc07da..06742c1d9f 100644 --- a/libavcodec/bintext.c +++ b/libavcodec/bintext.c @@ -148,7 +148,7 @@ static int decode_frame(AVCodecContext *avctx, s->frame.palette_has_changed = 1; memcpy(s->frame.data[1], s->palette, 16 * 4); - if (avctx->codec_id == CODEC_ID_XBIN) { + if (avctx->codec_id == AV_CODEC_ID_XBIN) { while (buf + 2 < buf_end) { int i,c,a; int type = *buf >> 6; @@ -179,7 +179,7 @@ static int decode_frame(AVCodecContext *avctx, break; } } - } else if (avctx->codec_id == CODEC_ID_IDF) { + } else if (avctx->codec_id == AV_CODEC_ID_IDF) { while (buf + 2 < buf_end) { if (AV_RL16(buf) == 1) { int i; @@ -219,7 +219,7 @@ static av_cold int decode_end(AVCodecContext *avctx) AVCodec ff_bintext_decoder = { .name = "bintext", .type = AVMEDIA_TYPE_VIDEO, - .id = CODEC_ID_BINTEXT, + .id = AV_CODEC_ID_BINTEXT, .priv_data_size = sizeof(XbinContext), .init = decode_init, .close = decode_end, @@ -232,7 +232,7 @@ AVCodec ff_bintext_decoder = { AVCodec ff_xbin_decoder = { .name = "xbin", .type = AVMEDIA_TYPE_VIDEO, - .id = CODEC_ID_XBIN, + .id = AV_CODEC_ID_XBIN, .priv_data_size = sizeof(XbinContext), .init = decode_init, .close = decode_end, @@ -245,7 +245,7 @@ AVCodec ff_xbin_decoder = { AVCodec ff_idf_decoder = { .name = "idf", .type = AVMEDIA_TYPE_VIDEO, - .id = CODEC_ID_IDF, + .id = AV_CODEC_ID_IDF, .priv_data_size = sizeof(XbinContext), .init = decode_init, .close = decode_end, |