* Fix the branch

include/vlc_symbols.h

@@ -495,8 +495,8 @@ struct module_symbols_t
     vlc_bool_t (*input_AddSubtitles_inner) (input_thread_t *, char *, vlc_bool_t);
     int (*utf8_fprintf_inner) (FILE *, const char *, ...);
     int (*utf8_vfprintf_inner) (FILE *stream, const char *fmt, va_list ap);
-    int (*utf8_fprintf_inner) (FILE *, const char *, ...);
-    int (*utf8_vfprintf_inner) (FILE *stream, const char *fmt, va_list ap);
+    void *utf8_fprintf_deprecated;
+    void *utf8_vfprintf_deprecated;
 };
 # if defined (__PLUGIN__)
 #  define aout_FiltersCreatePipeline (p_symbols)->aout_FiltersCreatePipeline_inner
@@ -972,8 +972,6 @@ struct module_symbols_t
 #  define input_AddSubtitles (p_symbols)->input_AddSubtitles_inner
 #  define utf8_fprintf (p_symbols)->utf8_fprintf_inner
 #  define utf8_vfprintf (p_symbols)->utf8_vfprintf_inner
-#  define utf8_fprintf (p_symbols)->utf8_fprintf_inner
-#  define utf8_vfprintf (p_symbols)->utf8_vfprintf_inner
 # elif defined (HAVE_DYNAMIC_PLUGINS) && !defined (__BUILTIN__)
 /******************************************************************
  * STORE_SYMBOLS: store VLC APIs into p_symbols for plugin access.
@@ -1452,11 +1450,11 @@ struct module_symbols_t
     ((p_symbols)->input_AddSubtitles_inner) = input_AddSubtitles; \
     ((p_symbols)->utf8_fprintf_inner) = utf8_fprintf; \
     ((p_symbols)->utf8_vfprintf_inner) = utf8_vfprintf; \
-    ((p_symbols)->utf8_fprintf_inner) = utf8_fprintf; \
-    ((p_symbols)->utf8_vfprintf_inner) = utf8_vfprintf; \
     (p_symbols)->net_ConvertIPv4_deprecated = NULL; \
     (p_symbols)->__stats_CounterGet_deprecated = NULL; \
     (p_symbols)->__stats_TimerDumpAll_deprecated = NULL; \
+    (p_symbols)->utf8_fprintf_deprecated = NULL; \
+    (p_symbols)->utf8_vfprintf_deprecated = NULL; \
 
 # endif /* __PLUGIN__ */
 #endif /* __VLC_SYMBOLS_H */

modules/codec/ffmpeg/encoder.c

@@ -868,7 +868,6 @@ static block_t *EncodeVideo( encoder_t *p_enc, picture_t *p_pict )
 
     i_out = avcodec_encode_video( p_sys->p_context, (uint8_t*)p_sys->p_buffer_out,
                                   p_sys->p_context->height * p_sys->p_context->width * 3, &frame );
-                                  p_context->height * p_context->width * 3, &frame );
 
     if( i_out > 0 )
     {

modules/misc/gnutls.c

@@ -345,8 +345,9 @@ gnutls_HandshakeAndValidate( tls_session_t *session )
 
     if( status )
     {
+        const error_msg_t *e;
         msg_Err( session, "TLS session: access denied" );
-        for( const error_msg_t *e = cert_errors; e->flag; e++ )
+        for( e = cert_errors; e->flag; e++ )
         {
             if( status & e->flag )
             {

src/video_output/video_output.c

@@ -701,6 +701,8 @@ static void RunThread( vout_thread_t *p_vout)
 
     subpicture_t *  p_subpic = NULL;                   /* subpicture pointer */
 
+    input_thread_t *p_input = NULL ;           /* Parent input, if it exists */
+
     vlc_value_t     val;
     vlc_bool_t      b_drop_late;