summaryrefslogtreecommitdiffstats
path: root/libhb/decavcodec.c
diff options
context:
space:
mode:
authorjstebbins <[email protected]>2015-03-29 16:22:30 +0000
committerjstebbins <[email protected]>2015-03-29 16:22:30 +0000
commit8e9bff8f32423c3ac69986bb3e4d03300d41dd4e (patch)
treea31260ce3ac5fc295f93f48ca2f7136563aa4455 /libhb/decavcodec.c
parent168ce686fd837de7fbf20266df31af2ac00c8db1 (diff)
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
Diffstat (limited to 'libhb/decavcodec.c')
-rw-r--r--libhb/decavcodec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libhb/decavcodec.c b/libhb/decavcodec.c
index dffb23a84..32eb4a21a 100644
--- a/libhb/decavcodec.c
+++ b/libhb/decavcodec.c
@@ -1327,7 +1327,7 @@ static int decodeFrame( hb_work_object_t *w, uint8_t *data, int size, int sequen
#endif
// If there was no pts for this frame, assume constant frame rate
// video & estimate the next frame time from the last & duration.
- if (pv->frame->pkt_pts == AV_NOPTS_VALUE || hb_gui_use_hwd_flag == 1)
+ if (pv->frame->pkt_pts == AV_NOPTS_VALUE || hb_hwd_enabled(w->h))
{
pts = pv->pts_next;
}