Merge commit '578ea75a9e4ac56e0bbbbe668700be756aa699f8'

[ffmpeg] / libavcodec / h263dec.c

diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c
index bf9e07254692752dbf9f6519c315658994cbda33..07e697fd2c51b7e9acbbd30b5acda9e2dfa1f01c 100644 (file)
--- 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);