X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Fimg2enc.c;h=d162cef19622d8c8c0506784d30e4f8e8346fbe6;hb=b7e9eea31f3e60dc506cf52bb78f0d9f679cb3bd;hp=58b46551392a9e5aabf9c0e50f725f28a4cedf41;hpb=4453f6b8613b0803246c1a9160c8270ec9de1237;p=ffmpeg diff --git a/libavformat/img2enc.c b/libavformat/img2enc.c index 58b46551392..d162cef1962 100644 --- a/libavformat/img2enc.c +++ b/libavformat/img2enc.c @@ -97,7 +97,7 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt) avio_close(pb[1]); avio_close(pb[2]); }else{ - if(ff_guess_image2_codec(s->filename) == CODEC_ID_JPEG2000){ + if(ff_guess_image2_codec(s->filename) == AV_CODEC_ID_JPEG2000){ AVStream *st = s->streams[0]; if(st->codec->extradata_size > 8 && AV_RL32(st->codec->extradata+4) == MKTAG('j','p','2','h')){ @@ -156,7 +156,7 @@ AVOutputFormat ff_image2_muxer = { "ppm,sgi,tga,tif,tiff,jp2,j2c,xwd,sun,ras,rs,im1,im8,im24," "sunras,xbm", .priv_data_size = sizeof(VideoMuxData), - .video_codec = CODEC_ID_MJPEG, + .video_codec = AV_CODEC_ID_MJPEG, .write_header = write_header, .write_packet = write_packet, .flags = AVFMT_NOTIMESTAMPS | AVFMT_NODIMENSIONS | AVFMT_NOFILE, @@ -168,7 +168,7 @@ AVOutputFormat ff_image2pipe_muxer = { .name = "image2pipe", .long_name = NULL_IF_CONFIG_SMALL("piped image2 sequence"), .priv_data_size = sizeof(VideoMuxData), - .video_codec = CODEC_ID_MJPEG, + .video_codec = AV_CODEC_ID_MJPEG, .write_header = write_header, .write_packet = write_packet, .flags = AVFMT_NOTIMESTAMPS | AVFMT_NODIMENSIONS