Mercurial > libavcodec.hg
comparison h264.c @ 8554:13d14e77e91a libavcodec
Rename ff_VDPAU as ff_vdpau.
| author | cehoyos |
|---|---|
| date | Wed, 07 Jan 2009 23:48:32 +0000 |
| parents | bf580075909f |
| children | 24c5744c3e96 |
comparison
equal
deleted
inserted
replaced
| 8553:6ce9f5616a57 | 8554:13d14e77e91a |
|---|---|
| 7423 && (avctx->skip_frame < AVDISCARD_BIDIR || hx->slice_type_nos!=FF_B_TYPE) | 7423 && (avctx->skip_frame < AVDISCARD_BIDIR || hx->slice_type_nos!=FF_B_TYPE) |
| 7424 && (avctx->skip_frame < AVDISCARD_NONKEY || hx->slice_type_nos==FF_I_TYPE) | 7424 && (avctx->skip_frame < AVDISCARD_NONKEY || hx->slice_type_nos==FF_I_TYPE) |
| 7425 && avctx->skip_frame < AVDISCARD_ALL){ | 7425 && avctx->skip_frame < AVDISCARD_ALL){ |
| 7426 if(ENABLE_H264_VDPAU_DECODER && avctx->codec_id == CODEC_ID_H264_VDPAU){ | 7426 if(ENABLE_H264_VDPAU_DECODER && avctx->codec_id == CODEC_ID_H264_VDPAU){ |
| 7427 static const uint8_t start_code[] = {0x00, 0x00, 0x01}; | 7427 static const uint8_t start_code[] = {0x00, 0x00, 0x01}; |
| 7428 ff_VDPAU_h264_add_data_chunk(h, start_code, sizeof(start_code)); | 7428 ff_vdpau_h264_add_data_chunk(h, start_code, sizeof(start_code)); |
| 7429 ff_VDPAU_h264_add_data_chunk(h, &buf[buf_index - consumed], consumed ); | 7429 ff_vdpau_h264_add_data_chunk(h, &buf[buf_index - consumed], consumed ); |
| 7430 }else | 7430 }else |
| 7431 context_count++; | 7431 context_count++; |
| 7432 } | 7432 } |
| 7433 break; | 7433 break; |
| 7434 case NAL_DPA: | 7434 case NAL_DPA: |
| 7631 } | 7631 } |
| 7632 h->prev_frame_num_offset= h->frame_num_offset; | 7632 h->prev_frame_num_offset= h->frame_num_offset; |
| 7633 h->prev_frame_num= h->frame_num; | 7633 h->prev_frame_num= h->frame_num; |
| 7634 | 7634 |
| 7635 if (ENABLE_H264_VDPAU_DECODER && avctx->codec_id == CODEC_ID_H264_VDPAU) | 7635 if (ENABLE_H264_VDPAU_DECODER && avctx->codec_id == CODEC_ID_H264_VDPAU) |
| 7636 ff_VDPAU_h264_picture_complete(h); | 7636 ff_vdpau_h264_picture_complete(h); |
| 7637 | 7637 |
| 7638 /* | 7638 /* |
| 7639 * FIXME: Error handling code does not seem to support interlaced | 7639 * FIXME: Error handling code does not seem to support interlaced |
| 7640 * when slices span multiple rows | 7640 * when slices span multiple rows |
| 7641 * The ff_er_add_slice calls don't work right for bottom | 7641 * The ff_er_add_slice calls don't work right for bottom |