diff options
| author | Rémi Denis-Courmont <remi@remlab.net> | 2013-07-25 22:30:17 +0300 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2013-08-05 11:15:49 +0200 |
| commit | 578ea75a9e4ac56e0bbbbe668700be756aa699f8 (patch) | |
| tree | 107c54d8a5ea874223b79b3368a0967f8bd9ca86 /libavcodec/h263dec.c | |
| parent | 488a0fa68973d48e264d54f1722f7afb18afbea7 (diff) | |
| download | ffmpeg-578ea75a9e4ac56e0bbbbe668700be756aa699f8.tar.gz | |
vdpau: remove old-style decoders
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Diffstat (limited to 'libavcodec/h263dec.c')
| -rw-r--r-- | libavcodec/h263dec.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c index 313012a7a3..7f90862b36 100644 --- a/libavcodec/h263dec.c +++ b/libavcodec/h263dec.c @@ -34,7 +34,6 @@ #include "h263_parser.h" #include "mpeg4video_parser.h" #include "msmpeg4.h" -#include "vdpau_internal.h" #include "thread.h" #include "flv.h" #include "mpeg4video.h" @@ -624,11 +623,6 @@ retry: if (!s->divx_packed && !avctx->hwaccel) ff_thread_finish_setup(avctx); - if (CONFIG_MPEG4_VDPAU_DECODER && (s->avctx->codec->capabilities & CODEC_CAP_HWACCEL_VDPAU)) { - ff_vdpau_mpeg4_decode_picture(s, s->gb.buffer, s->gb.buffer_end - s->gb.buffer); - goto frame_end; - } - if (avctx->hwaccel) { if (avctx->hwaccel->start_frame(avctx, s->gb.buffer, s->gb.buffer_end - s->gb.buffer) < 0) return -1; @@ -673,7 +667,6 @@ retry: } assert(s->bitstream_buffer_size==0); -frame_end: /* divx 5.01+ bistream reorder stuff */ if(s->codec_id==AV_CODEC_ID_MPEG4 && s->divx_packed){ int current_pos= get_bits_count(&s->gb)>>3; |