Mercurial > libavcodec.hg

diff h264.c @ 9012:15a3df8c01fd libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
More approved hunks for VAAPI & our new and cleaner hwaccel API. patch by Gwenole Beauchesne gbeauchesne splitted-desktop com
author michael
date Mon, 23 Feb 2009 13:44:51 +0000
parents aae80543bc6e
children ccde7fbba09e
line wrap: on
line diff
--- a/h264.c	Mon Feb 23 13:35:52 2009 +0000
+++ b/h264.c	Mon Feb 23 13:44:51 2009 +0000
@@ -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 @@
     H264Context *hx;
     int i;
 
+    if (s->avctx->hwaccel)
+        return;
     if(s->avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU)
         return;
     if(context_count == 1) {