Mercurial > libavcodec.hg
comparison mpeg12.c @ 8602:d90dec69b2a2 libavcodec
12l: Fix compilation with --disable-vdpau.
| author | cehoyos |
|---|---|
| date | Fri, 16 Jan 2009 02:50:20 +0000 |
| parents | 8b80f8285b1b |
| children | 48c89068a41b |
comparison
equal
deleted
inserted
replaced
| 8601:8b80f8285b1b | 8602:d90dec69b2a2 |
|---|---|
| 2311 avctx->execute(avctx, slice_decode_thread, (void**)&(s2->thread_context[0]), NULL, s->slice_count, sizeof(void*)); | 2311 avctx->execute(avctx, slice_decode_thread, (void**)&(s2->thread_context[0]), NULL, s->slice_count, sizeof(void*)); |
| 2312 for(i=0; i<s->slice_count; i++) | 2312 for(i=0; i<s->slice_count; i++) |
| 2313 s2->error_count += s2->thread_context[i]->error_count; | 2313 s2->error_count += s2->thread_context[i]->error_count; |
| 2314 } | 2314 } |
| 2315 | 2315 |
| 2316 if (avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU) | 2316 if (CONFIG_MPEG_VDPAU_DECODER && avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU) |
| 2317 ff_vdpau_mpeg_picture_complete(s2, buf, buf_size, s->slice_count); | 2317 ff_vdpau_mpeg_picture_complete(s2, buf, buf_size, s->slice_count); |
| 2318 | 2318 |
| 2319 if (slice_end(avctx, picture)) { | 2319 if (slice_end(avctx, picture)) { |
| 2320 if(s2->last_picture_ptr || s2->low_delay) //FIXME merge with the stuff in mpeg_decode_slice | 2320 if(s2->last_picture_ptr || s2->low_delay) //FIXME merge with the stuff in mpeg_decode_slice |
| 2321 *data_size = sizeof(AVPicture); | 2321 *data_size = sizeof(AVPicture); |