vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Sun Jun  5 
14:05:21 2016 +0300| [4c2de37f93b3e3e41e30d326ec760f3a7b661cf2] | committer: 
Rémi Denis-Courmont

Revert "Revert "transcode: disable hardware decoding by default""

This reverts commit 059d52fb1d83525b3f8bfb242e34f8e7e87caec8.

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

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

diff --git a/modules/stream_out/transcode/transcode.c 
b/modules/stream_out/transcode/transcode.c
index ef7bd44..1789205 100644
--- a/modules/stream_out/transcode/transcode.c
+++ b/modules/stream_out/transcode/transcode.c
@@ -383,6 +383,12 @@ static int Open( vlc_object_t *p_this )
                  p_sys->f_scale, p_sys->i_vbitrate / 1000 );
     }
 
+    /* Disable hardware decoding by default (unlike normal playback) */
+    psz_string = var_CreateGetString( p_stream, "avcodec-hw" );
+    if( !strcasecmp( "any", psz_string ) )
+        var_SetString( p_stream, "avcodec-hw", "none" );
+    free( psz_string );
+
     /* Subpictures transcoding parameters */
     p_sys->p_spu = NULL;
     p_sys->p_spu_blend = NULL;

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

Reply via email to