[MPlayer-cvslog] r36169 - trunk/libmpcodecs/vd_ffmpeg.c

[reimar]

Author: reimar
Date: Fri Apr  5 16:24:54 2013
New Revision: 36169

Log:
Ensure we call init_vo at the end of get_format to ensure the vo is properly initialized.

This seems to fix bug #2135.

Modified:
   trunk/libmpcodecs/vd_ffmpeg.c

Modified: trunk/libmpcodecs/vd_ffmpeg.c
==============================================================================
--- trunk/libmpcodecs/vd_ffmpeg.c	Fri Apr  5 16:21:40 2013	(r36168)
+++ trunk/libmpcodecs/vd_ffmpeg.c	Fri Apr  5 16:24:54 2013	(r36169)
@@ -1001,8 +1001,10 @@ static enum AVPixelFormat get_format(str
         }
     }
     selected_format = fmt[i];
-    if (selected_format == PIX_FMT_NONE)
+    if (selected_format == PIX_FMT_NONE) {
         selected_format = avcodec_default_get_format(avctx, fmt);
+        init_vo(sh, selected_format);
+    }
     set_format_params(avctx, selected_format);
     return selected_format;
 }