diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-02 18:46:20 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-02 18:46:25 +0200 |
commit | cea9ee5dbd9312076676693be4dfadb0664ea420 (patch) | |
tree | 54798510ff5c7fc69501edbb28df4a8127bca668 /doc/APIchanges | |
parent | 41a679000f22884017107e90bfbcf2069c69d08c (diff) | |
parent | fa4f7b17bc120effb82874538d895da1c92ba886 (diff) | |
download | ffmpeg-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 'doc/APIchanges')
-rw-r--r-- | doc/APIchanges | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/APIchanges b/doc/APIchanges index 7e3c592d75..b4fa99f2d4 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -15,6 +15,9 @@ libavutil: 2012-10-22 API changes, most recent first: +2014-05-xx - xxxxxxx - lavu 52.81.0 - opt.h + Add av_opt_set_dict2() function. + 2014-04-xx - xxxxxxx - lavc 55.50.3 - avcodec.h Deprecate CODEC_FLAG_MV0. It is replaced by the flag "mv0" in the "mpv_flags" private option of the mpegvideo encoders. |