diff options
| author | Anton Khirnov <anton@khirnov.net> | 2012-08-05 11:11:04 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2012-08-07 16:00:24 +0200 |
| commit | 36ef5369ee9b336febc2c270f8718cec4476cb85 (patch) | |
| tree | d186adbb488e7f002aa894743b1ce0e8925520e6 /libavcodec/mjpegdec.c | |
| parent | 104e10fb426f903ba9157fdbfe30292d0e4c3d72 (diff) | |
| download | ffmpeg-36ef5369ee9b336febc2c270f8718cec4476cb85.tar.gz | |
Replace all CODEC_ID_* with AV_CODEC_ID_*
Diffstat (limited to 'libavcodec/mjpegdec.c')
| -rw-r--r-- | libavcodec/mjpegdec.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 7864d3881e..c509402151 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -113,7 +113,7 @@ av_cold int ff_mjpeg_decode_init(AVCodecContext *avctx) s->interlace_polarity = 1; /* bottom field first */ av_log(avctx, AV_LOG_DEBUG, "mjpeg bottom field first\n"); } - if (avctx->codec->id == CODEC_ID_AMV) + if (avctx->codec->id == AV_CODEC_ID_AMV) s->flipped = 1; return 0; @@ -1354,7 +1354,7 @@ int ff_mjpeg_find_marker(MJpegDecodeContext *s, uint8_t x = *(src++); *(dst++) = x; - if (s->avctx->codec_id != CODEC_ID_THP) { + if (s->avctx->codec_id != AV_CODEC_ID_THP) { if (x == 0xff) { while (src < buf_end && x == 0xff) x = *(src++); @@ -1645,7 +1645,7 @@ static const AVClass mjpegdec_class = { AVCodec ff_mjpeg_decoder = { .name = "mjpeg", .type = AVMEDIA_TYPE_VIDEO, - .id = CODEC_ID_MJPEG, + .id = AV_CODEC_ID_MJPEG, .priv_data_size = sizeof(MJpegDecodeContext), .init = ff_mjpeg_decode_init, .close = ff_mjpeg_decode_end, @@ -1658,7 +1658,7 @@ AVCodec ff_mjpeg_decoder = { AVCodec ff_thp_decoder = { .name = "thp", .type = AVMEDIA_TYPE_VIDEO, - .id = CODEC_ID_THP, + .id = AV_CODEC_ID_THP, .priv_data_size = sizeof(MJpegDecodeContext), .init = ff_mjpeg_decode_init, .close = ff_mjpeg_decode_end, |