diff options
| author | Gwenole Beauchesne <gbeauchesne@splitted-desktop.com> | 2009-02-23 13:44:51 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2009-02-23 13:44:51 +0000 |
| commit | 40e5d31b576fcd0674acf35ce2120242a72dd801 (patch) | |
| tree | 3ed8ebd14acb62a2320239f6f6171feef8d1b00d /libavcodec/h264.c | |
| parent | c269cf68a0d1579f41e082288072e3f182ef2b5f (diff) | |
| download | ffmpeg-40e5d31b576fcd0674acf35ce2120242a72dd801.tar.gz | |
More approved hunks for VAAPI & our new and cleaner hwaccel API.
patch by Gwenole Beauchesne gbeauchesne splitted-desktop com
Originally committed as revision 17540 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/h264.c')
| -rw-r--r-- | libavcodec/h264.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 5339ed017e..6ea09b086e 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -25,6 +25,7 @@ * @author Michael Niedermayer <michaelni@gmx.at> */ +#include "internal.h" #include "dsputil.h" #include "avcodec.h" #include "mpegvideo.h" @@ -7356,6 +7357,8 @@ static void execute_decode_slices(H264Context *h, int context_count){ H264Context *hx; int i; + if (s->avctx->hwaccel) + return; if(s->avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU) return; if(context_count == 1) { |