vlc | branch: master | Steve Lhomme <rob...@ycbcr.xyz> | Tue Jan 12 10:05:37 
2021 +0100| [9059a43d12f5387ac1566531ede709209cd374dc] | committer: Steve Lhomme

x264: don't force the output ES format

If it's not set when calling Open there is a big problem.

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

 modules/codec/x264.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/codec/x264.c b/modules/codec/x264.c
index 1e04a9ca01..fe6c043015 100644
--- a/modules/codec/x264.c
+++ b/modules/codec/x264.c
@@ -804,7 +804,7 @@ static int  Open ( vlc_object_t *p_this )
 
     config_ChainParse( p_enc, SOUT_CFG_PREFIX, ppsz_sout_options, p_enc->p_cfg 
);
 
-    p_enc->fmt_out.i_cat = VIDEO_ES;
+    assert(p_enc->fmt_out.i_cat == VIDEO_ES);
 #ifdef MODULE_NAME_IS_x262
     p_enc->fmt_out.i_codec = VLC_CODEC_MP2V;
 #else

_______________________________________________
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

Reply via email to