diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-06 13:24:22 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-06 13:24:22 +0200 |
| commit | bf36dc50ea448999c8f8c7a35f6139a7040f6275 (patch) | |
| tree | c6680553d1ea71baf7408233b6eec6ab92d75b8a /libavcodec/h263dec.c | |
| parent | b7fc2693c70fe72936e4ce124c802ac23857c476 (diff) | |
| parent | 578ea75a9e4ac56e0bbbbe668700be756aa699f8 (diff) | |
| download | ffmpeg-bf36dc50ea448999c8f8c7a35f6139a7040f6275.tar.gz | |
Merge commit '578ea75a9e4ac56e0bbbbe668700be756aa699f8'
* commit '578ea75a9e4ac56e0bbbbe668700be756aa699f8':
vdpau: remove old-style decoders
Conflicts:
libavcodec/allcodecs.c
libavcodec/h263dec.c
libavcodec/h264.c
libavcodec/mpeg12dec.c
libavcodec/mpeg4videodec.c
libavcodec/vc1dec.c
libavcodec/vdpau.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
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 bf9e072546..07e697fd2c 100644 --- a/libavcodec/h263dec.c +++ b/libavcodec/h263dec.c @@ -36,7 +36,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" @@ -652,11 +651,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 ((ret = avctx->hwaccel->start_frame(avctx, s->gb.buffer, s->gb.buffer_end - s->gb.buffer)) < 0) return ret; @@ -701,7 +695,6 @@ retry: } av_assert1(s->bitstream_buffer_size==0); -frame_end: /* divx 5.01+ bitstream reorder stuff */ if(s->codec_id==AV_CODEC_ID_MPEG4 && s->divx_packed){ int current_pos= s->gb.buffer == s->bitstream_buffer ? 0 : (get_bits_count(&s->gb)>>3); |