libhb: Eliminate global variable hb_gui_use_hwd_flag

This global was shared between the CLI and libhb and used as a back door to
force scan and encode passes to use the same ffmpeg context for hardware
decoding. Aside from the fact that this context sharing should not be necessary
and needs fixing, this information belongs in the hb_handle_t that is shared
between the scan and the encode.  So put it there and make sure the hb_handle_t
get propagated to where the flag is needed.


git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@7028 b64f7644-9d1e-0410-96f1-a4d463321fa5

1 files changed, 5 insertions, 5 deletions

diff --git a/libhb/cropscale.c b/libhb/cropscale.c
index 15c04c4bb..d1ef0f9bb 100644
--- a/libhb/cropscale.c
+++ b/libhb/cropscale.c
@@ -245,19 +245,19 @@ static int hb_crop_scale_work( hb_filter_object_t * filter,
     }
 
     /* OpenCL/DXVA2 */
-    if ((!pv->use_decomb && !pv->use_detelecine                       &&
+    if ((!pv->use_dxva &&
          !pv->crop[0] && !pv->crop[1] && !pv->crop[2] && !pv->crop[3] &&
          in->f.fmt == pv->pix_fmt_out && in->f.width == pv->width_out &&
-         in->f.height == pv->height_out) || (pv->use_dxva &&
-                                             in->f.width  == pv->width_out &&
-                                             in->f.height == pv->height_out))
+         in->f.height == pv->height_out) ||
+        (pv->use_dxva && !pv->use_decomb && !pv->use_detelecine &&
+         in->f.width  == pv->width_out && in->f.height == pv->height_out))
     {
         *buf_out = in;
         *buf_in  = NULL;
         return HB_FILTER_OK;
     }
 
-    *buf_out = crop_scale( pv, in );
+    *buf_out = crop_scale(pv, in);
 
     return HB_FILTER_OK;
 }