From: Michael Niedermayer Date: Fri, 2 May 2014 16:46:20 +0000 (+0200) Subject: Merge remote-tracking branch 'lukaszmluki/master' X-Git-Tag: n2.3~1398 X-Git-Url: http://git.videolan.org/?p=ffmpeg.git;a=commitdiff_plain;h=cea9ee5dbd9312076676693be4dfadb0664ea420 Merge remote-tracking branch 'lukaszmluki/master' * lukaszmluki/master: lavd/xv: reident after previous commits lavf/mux: pass options to nested structs of priv data lavu/opt: add av_opt_set_dict2() function lavd/opengl_enc: fix window size correction code lavd/opengl_enc: add window size param lavd/opengl_enc: use flag to mark inited context Merged-by: Michael Niedermayer --- cea9ee5dbd9312076676693be4dfadb0664ea420