aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/mpegvideo.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-05-02 18:46:20 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-05-02 18:46:25 +0200
commitcea9ee5dbd9312076676693be4dfadb0664ea420 (patch)
tree54798510ff5c7fc69501edbb28df4a8127bca668 /libavcodec/mpegvideo.c
parent41a679000f22884017107e90bfbcf2069c69d08c (diff)
parentfa4f7b17bc120effb82874538d895da1c92ba886 (diff)
downloadffmpeg-cea9ee5dbd9312076676693be4dfadb0664ea420.tar.gz
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>
Diffstat (limited to 'libavcodec/mpegvideo.c')
0 files changed, 0 insertions, 0 deletions