[FFmpeg-cvslog] r17591 - trunk/libavcodec/h264.c

[michael]

Author: michael
Date: Wed Feb 25 20:39:42 2009
New Revision: 17591

Log:
Add hwaccel->decode_slice() call for avhwaccel by Gwenole Beauchesne.

Modified:
   trunk/libavcodec/h264.c

Modified: trunk/libavcodec/h264.c
==============================================================================
--- trunk/libavcodec/h264.c	Wed Feb 25 20:16:27 2009	(r17590)
+++ trunk/libavcodec/h264.c	Wed Feb 25 20:39:42 2009	(r17591)
@@ -7494,6 +7494,10 @@ static int decode_nal_units(H264Context 
                && (avctx->skip_frame < AVDISCARD_BIDIR  || hx->slice_type_nos!=FF_B_TYPE)
                && (avctx->skip_frame < AVDISCARD_NONKEY || hx->slice_type_nos==FF_I_TYPE)
                && avctx->skip_frame < AVDISCARD_ALL){
+                if(avctx->hwaccel) {
+                    if (avctx->hwaccel->decode_slice(avctx, &buf[buf_index - consumed], consumed) < 0)
+                        return -1;
+                }else
                 if(CONFIG_H264_VDPAU_DECODER && s->avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU){
                     static const uint8_t start_code[] = {0x00, 0x00, 0x01};
                     ff_vdpau_add_data_chunk(s, start_code, sizeof(start_code));