Merge remote-tracking branch 'lukaszmluki/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 2 May 2014 16:46:20 +0000 (18:46 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 2 May 2014 16:46:25 +0000 (18:46 +0200)
commitcea9ee5dbd9312076676693be4dfadb0664ea420
tree54798510ff5c7fc69501edbb28df4a8127bca668
parent41a679000f22884017107e90bfbcf2069c69d08c
parentfa4f7b17bc120effb82874538d895da1c92ba886
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 <michaelni@gmx.at>