summaryrefslogtreecommitdiff
path: root/libavcodec/lcldec.c
diff options
context:
space:
mode:
Diffstat (limited to 'libavcodec/lcldec.c')
-rw-r--r--libavcodec/lcldec.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/libavcodec/lcldec.c b/libavcodec/lcldec.c
index 0b08900f5d..d2482138ab 100644
--- a/libavcodec/lcldec.c
+++ b/libavcodec/lcldec.c
@@ -189,7 +189,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPac
/* Decompress frame */
switch (avctx->codec_id) {
- case CODEC_ID_MSZH:
+ case AV_CODEC_ID_MSZH:
switch (c->compression) {
case COMP_MSZH:
if (c->flags & FLAG_MULTITHREAD) {
@@ -252,7 +252,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPac
}
break;
#if CONFIG_ZLIB_DECODER
- case CODEC_ID_ZLIB:
+ case AV_CODEC_ID_ZLIB:
/* Using the original dll with normal compression (-1) and RGB format
* gives a file with ZLIB fourcc, but frame is really uncompressed.
* To be sure that's true check also frame size */
@@ -290,7 +290,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPac
/* Apply PNG filter */
- if (avctx->codec_id == CODEC_ID_ZLIB && (c->flags & FLAG_PNGFILTER)) {
+ if (avctx->codec_id == AV_CODEC_ID_ZLIB && (c->flags & FLAG_PNGFILTER)) {
switch (c->imgtype) {
case IMGTYPE_YUV111:
case IMGTYPE_RGB24:
@@ -485,8 +485,8 @@ static av_cold int decode_init(AVCodecContext *avctx)
}
/* Check codec type */
- if ((avctx->codec_id == CODEC_ID_MSZH && avctx->extradata[7] != CODEC_MSZH) ||
- (avctx->codec_id == CODEC_ID_ZLIB && avctx->extradata[7] != CODEC_ZLIB)) {
+ if ((avctx->codec_id == AV_CODEC_ID_MSZH && avctx->extradata[7] != CODEC_MSZH) ||
+ (avctx->codec_id == AV_CODEC_ID_ZLIB && avctx->extradata[7] != CODEC_ZLIB)) {
av_log(avctx, AV_LOG_ERROR, "Codec id and codec type mismatch. This should not happen.\n");
}
@@ -536,7 +536,7 @@ static av_cold int decode_init(AVCodecContext *avctx)
/* Detect compression method */
c->compression = (int8_t)avctx->extradata[5];
switch (avctx->codec_id) {
- case CODEC_ID_MSZH:
+ case AV_CODEC_ID_MSZH:
switch (c->compression) {
case COMP_MSZH:
av_log(avctx, AV_LOG_DEBUG, "Compression enabled.\n");
@@ -551,7 +551,7 @@ static av_cold int decode_init(AVCodecContext *avctx)
}
break;
#if CONFIG_ZLIB_DECODER
- case CODEC_ID_ZLIB:
+ case AV_CODEC_ID_ZLIB:
switch (c->compression) {
case COMP_ZLIB_HISPEED:
av_log(avctx, AV_LOG_DEBUG, "High speed compression.\n");
@@ -590,14 +590,14 @@ static av_cold int decode_init(AVCodecContext *avctx)
av_log(avctx, AV_LOG_DEBUG, "Multithread encoder flag set.\n");
if (c->flags & FLAG_NULLFRAME)
av_log(avctx, AV_LOG_DEBUG, "Nullframe insertion flag set.\n");
- if (avctx->codec_id == CODEC_ID_ZLIB && (c->flags & FLAG_PNGFILTER))
+ if (avctx->codec_id == AV_CODEC_ID_ZLIB && (c->flags & FLAG_PNGFILTER))
av_log(avctx, AV_LOG_DEBUG, "PNG filter flag set.\n");
if (c->flags & FLAGMASK_UNUSED)
av_log(avctx, AV_LOG_ERROR, "Unknown flag set (%d).\n", c->flags);
/* If needed init zlib */
#if CONFIG_ZLIB_DECODER
- if (avctx->codec_id == CODEC_ID_ZLIB) {
+ if (avctx->codec_id == AV_CODEC_ID_ZLIB) {
int zret;
c->zstream.zalloc = Z_NULL;
c->zstream.zfree = Z_NULL;
@@ -627,7 +627,7 @@ static av_cold int decode_end(AVCodecContext *avctx)
if (c->pic.data[0])
avctx->release_buffer(avctx, &c->pic);
#if CONFIG_ZLIB_DECODER
- if (avctx->codec_id == CODEC_ID_ZLIB)
+ if (avctx->codec_id == AV_CODEC_ID_ZLIB)
inflateEnd(&c->zstream);
#endif
@@ -638,7 +638,7 @@ static av_cold int decode_end(AVCodecContext *avctx)
AVCodec ff_mszh_decoder = {
.name = "mszh",
.type = AVMEDIA_TYPE_VIDEO,
- .id = CODEC_ID_MSZH,
+ .id = AV_CODEC_ID_MSZH,
.priv_data_size = sizeof(LclDecContext),
.init = decode_init,
.close = decode_end,
@@ -652,7 +652,7 @@ AVCodec ff_mszh_decoder = {
AVCodec ff_zlib_decoder = {
.name = "zlib",
.type = AVMEDIA_TYPE_VIDEO,
- .id = CODEC_ID_ZLIB,
+ .id = AV_CODEC_ID_ZLIB,
.priv_data_size = sizeof(LclDecContext),
.init = decode_init,
.close = decode_end,