* modules/codec/ffmpeg/encoder.c, modules/stream_out/transcode.c: backport of 11318...

[vlc] / modules / codec / ffmpeg / encoder.c

diff --git a/modules/codec/ffmpeg/encoder.c b/modules/codec/ffmpeg/encoder.c
index cb7d235bbd001cb2b43c95a117059877f3ba3763..5f08f6e4a9ef7ff3e382b4967f024c18b8c6cdfe 100644 (file)
--- a/modules/codec/ffmpeg/encoder.c
+++ b/modules/codec/ffmpeg/encoder.c
@@ -419,7 +419,7 @@ int E_(OpenEncoder)( vlc_object_t *p_this )
         if ( p_sys->b_trellis )
             p_context->flags |= CODEC_FLAG_TRELLIS_QUANT;
 
-        if ( p_sys->i_qmin == p_sys->i_qmax )
+        if ( p_sys->i_qmin > 0 && p_sys->i_qmin == p_sys->i_qmax )
             p_context->flags |= CODEC_FLAG_QSCALE;
 
 #if LIBAVCODEC_BUILD >= 4702