X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fvdpau.c;h=da9ae9ddfb0c8321af78bfd77f7aeb5082001f72;hb=f9505923a344a56c3ff36925adb7f0c3c9a3996c;hp=ce5103a6afc389ef9cc2dd153c609903cd9f4acd;hpb=9ca27df52fb4306a8e37c38d1ed9ab40c42a62dc;p=ffmpeg diff --git a/libavcodec/vdpau.c b/libavcodec/vdpau.c index ce5103a6afc..da9ae9ddfb0 100644 --- a/libavcodec/vdpau.c +++ b/libavcodec/vdpau.c @@ -340,7 +340,7 @@ void ff_vdpau_mpeg4_decode_picture(MpegEncContext *s, const uint8_t *buf, render->info.mpeg4.interlaced = !s->progressive_sequence; render->info.mpeg4.quant_type = s->mpeg_quant; render->info.mpeg4.quarter_sample = s->quarter_sample; - render->info.mpeg4.short_video_header = s->avctx->codec->id == CODEC_ID_H263; + render->info.mpeg4.short_video_header = s->avctx->codec->id == AV_CODEC_ID_H263; render->info.mpeg4.rounding_control = s->no_rounding; render->info.mpeg4.alternate_vertical_scan_flag = s->alternate_scan; render->info.mpeg4.top_field_first = s->top_field_first; @@ -389,7 +389,7 @@ static int vdpau_mpeg2_end_frame(AVCodecContext *avctx) AVHWAccel ff_mpeg1_vdpau_hwaccel = { .name = "mpeg1_vdpau", .type = AVMEDIA_TYPE_VIDEO, - .id = CODEC_ID_MPEG1VIDEO, + .id = AV_CODEC_ID_MPEG1VIDEO, .pix_fmt = PIX_FMT_VDPAU_MPEG1, .start_frame = vdpau_mpeg2_start_frame, .end_frame = vdpau_mpeg2_end_frame, @@ -399,7 +399,7 @@ AVHWAccel ff_mpeg1_vdpau_hwaccel = { AVHWAccel ff_mpeg2_vdpau_hwaccel = { .name = "mpeg2_vdpau", .type = AVMEDIA_TYPE_VIDEO, - .id = CODEC_ID_MPEG2VIDEO, + .id = AV_CODEC_ID_MPEG2VIDEO, .pix_fmt = PIX_FMT_VDPAU_MPEG2, .start_frame = vdpau_mpeg2_start_frame, .end_frame = vdpau_mpeg2_end_frame,