Mercurial > libavcodec.hg
changeset 8610:2ca51be7dad8 libavcodec
Remove CODEC_ID_H264_VDPAU.
| author | cehoyos |
|---|---|
| date | Sat, 17 Jan 2009 01:17:04 +0000 |
| parents | 99bfffc29ab9 |
| children | a637db9f59b1 |
| files | avcodec.h h264.c h264_parser.c |
| diffstat | 3 files changed, 7 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/avcodec.h Fri Jan 16 20:46:38 2009 +0000 +++ b/avcodec.h Sat Jan 17 01:17:04 2009 +0000 @@ -191,9 +191,6 @@ CODEC_ID_TGV, CODEC_ID_TGQ, - /* "codecs" for HW decoding with VDPAU */ - CODEC_ID_H264_VDPAU= 0x9000, - /* various PCM "codecs" */ CODEC_ID_PCM_S16LE= 0x10000, CODEC_ID_PCM_S16BE,
--- a/h264.c Fri Jan 16 20:46:38 2009 +0000 +++ b/h264.c Sat Jan 17 01:17:04 2009 +0000 @@ -2189,7 +2189,7 @@ if(avctx->codec_id == CODEC_ID_SVQ3) avctx->pix_fmt= PIX_FMT_YUVJ420P; - else if(avctx->codec_id == CODEC_ID_H264_VDPAU) + else if(s->avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU) avctx->pix_fmt= PIX_FMT_VDPAU_H264; else avctx->pix_fmt= PIX_FMT_YUV420P; @@ -7293,7 +7293,7 @@ H264Context *hx; int i; - if(avctx->codec_id == CODEC_ID_H264_VDPAU) + if(s->avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU) return; if(context_count == 1) { decode_slice(avctx, &h); @@ -7423,7 +7423,7 @@ && (avctx->skip_frame < AVDISCARD_BIDIR || hx->slice_type_nos!=FF_B_TYPE) && (avctx->skip_frame < AVDISCARD_NONKEY || hx->slice_type_nos==FF_I_TYPE) && avctx->skip_frame < AVDISCARD_ALL){ - if(CONFIG_H264_VDPAU_DECODER && avctx->codec_id == CODEC_ID_H264_VDPAU){ + if(CONFIG_H264_VDPAU_DECODER && s->avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU){ static const uint8_t start_code[] = {0x00, 0x00, 0x01}; ff_vdpau_add_data_chunk(s, start_code, sizeof(start_code)); ff_vdpau_add_data_chunk(s, &buf[buf_index - consumed], consumed ); @@ -7624,7 +7624,7 @@ s->current_picture_ptr->qscale_type= FF_QSCALE_TYPE_H264; s->current_picture_ptr->pict_type= s->pict_type; - if (CONFIG_H264_VDPAU_DECODER && avctx->codec_id == CODEC_ID_H264_VDPAU) + if (CONFIG_H264_VDPAU_DECODER && s->avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU) ff_vdpau_h264_set_reference_frames(s); if(!s->dropable) { @@ -7635,7 +7635,7 @@ h->prev_frame_num_offset= h->frame_num_offset; h->prev_frame_num= h->frame_num; - if (CONFIG_H264_VDPAU_DECODER && avctx->codec_id == CODEC_ID_H264_VDPAU) + if (CONFIG_H264_VDPAU_DECODER && s->avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU) ff_vdpau_h264_picture_complete(s); /* @@ -8027,7 +8027,7 @@ AVCodec h264_vdpau_decoder = { "h264_vdpau", CODEC_TYPE_VIDEO, - CODEC_ID_H264_VDPAU, + CODEC_ID_H264, sizeof(H264Context), decode_init, NULL,