vlc | branch: master | Steve Lhomme <[email protected]> | Mon Jan 11 09:15:56 
2021 +0100| [a06c71fc094ffcbdb27fe5df958ee63e73bb9c0f] | committer: Steve Lhomme

transcode: don't use hardware decoder with --no-hw-dec

It's still possible to use the hardware filters as the hw-dec option only
applies to decoding.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a06c71fc094ffcbdb27fe5df958ee63e73bb9c0f
---

 modules/stream_out/transcode/video.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules/stream_out/transcode/video.c 
b/modules/stream_out/transcode/video.c
index dd3093a969..adf989d22a 100644
--- a/modules/stream_out/transcode/video.c
+++ b/modules/stream_out/transcode/video.c
@@ -73,6 +73,9 @@ static const struct encoder_owner_callbacks 
encoder_video_transcode_cbs = {
 
 static vlc_decoder_device * video_get_decoder_device( decoder_t *p_dec )
 {
+    if( !var_InheritBool( p_dec, "hw-dec" ) )
+        return NULL;
+
     struct decoder_owner *p_owner = dec_get_owner( p_dec );
     return TranscodeHoldDecoderDevice(&p_dec->obj, p_owner->id);
 }

_______________________________________________
vlc-commits mailing list
[email protected]
https://mailman.videolan.org/listinfo/vlc-commits

Reply via email to