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 | |
| 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')
| -rw-r--r-- | doc/APIchanges | 3 | ||||
| -rw-r--r-- | doc/outdevs.texi | 4 |
2 files changed, 7 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. diff --git a/doc/outdevs.texi b/doc/outdevs.texi index a1d89eb801..1104133c61 100644 --- a/doc/outdevs.texi +++ b/doc/outdevs.texi @@ -237,6 +237,10 @@ Application must provide OpenGL context and both @code{window_size_cb} and @code @item window_title Set the SDL window title, if not specified default to the filename specified for the output device. Ignored when @option{no_window} is set. +@item window_size +Set preferred window size, can be a string of the form widthxheight or a video size abbreviation. +If not specified it defaults to the size of the input video, downscaled according to the aspect ratio. +Mostly usable when @option{no_window} is not set. @end table |