Age | Commit message (Collapse) | Author |
|
* qatar/master:
doc: fix one accented word
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
* commit '48d1ed9c83ee0c388e8c2898e81ffb4add509ab9':
doc: name correct header
Conflicts:
doc/APIchanges
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
Idea-by: ubitux
Reviewed-by: Timothy Gu <timothygu99@gmail.com>
Reviewed-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
|
|
|
|
|
* commit '1155fd02ae7bac215acab316e847c6bb25f74fc3':
frame: add a convenience function for copying AVFrame data
Conflicts:
doc/APIchanges
libavutil/frame.c
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
* commit '746dca483a2f0f2639265f6e1c0085c8861875a1':
avconv: support forcing codec tags for input streams
Conflicts:
doc/ffmpeg.texi
See: 6bca574a98ba604459f6ee92538b19d25bba0973
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
Idea-from/based-on: 7e86c27b4ee9e5a3fbe6cf5249b9d918b2a5e731
Reviewed-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
|
|
|
|
|
* commit '7e86c27b4ee9e5a3fbe6cf5249b9d918b2a5e731':
lavr: add a function for checking whether AVAudioResampleContext is open
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
|
|
* commit 'c3ecd968f0e78da6e77f0c06c2f785b266d83cf1':
AVOptions: add flags for read/read-only options
Conflicts:
libavutil/opt.c
libavutil/opt.h
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
* commit '6bb8720f00e2e6209665f819fb351fd42b82d5d0':
AVOptions: deprecate unused AV_OPT_FLAG_METADATA
Conflicts:
doc/APIchanges
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
* commit '93632a70f9ac2cb2ebf0e69d21fdfaae68ff02fd':
doc: Name the MOV muxer as it should be called
Conflicts:
doc/muxers.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
|
|
It was never used since it was added and the things it was intended for
are now exported differently.
|
|
The section name is the muxer, not the format.
|
|
Keep the sections alphabetically sorted.
|
|
* qatar/master:
vf_interlace: deprecate lowpass option
Conflicts:
libavfilter/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
|
|
This makes the examples page less cluttered
Reviewed-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
|
* lukaszmluki/master:
lavd: add list devices API
lavd/opengl_enc_shaders: fix gray* shader
Conflicts:
doc/APIchanges
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
* commit 'b339182eba34f28de5f1a477cdd2c84f1ef35d90':
Move all example programs to doc/examples
Conflicts:
configure
doc/Makefile
doc/doxy-wrapper.sh
doc/examples/avcodec.c
doc/examples/decoding_encoding.c
doc/examples/metadata.c
doc/examples/muxing.c
doc/examples/transcode_aac.c
libavcodec/Makefile
libavcodec/api-example.c
libavformat/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
|
|
|
|
Also drop support for building examples in library directories.
|
|
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
|
|
telecined material.
Signed-off-by: Nicholas Robbins <nickrobbins@yahoo.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
|
These charts in man page are currently destroyed.
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
|
* commit 'c98f3169bfb578c1a4e407b44524f0bfa3b4dc0c':
lavu: add AV_FRAME_DATA_DOWNMIX_INFO side data type.
Conflicts:
doc/APIchanges
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
|
|
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
|
There were a few grammar and spelling mistakes in this filter
description. I went through it and corrected them without changing
the meaning.
|
|
* qatar/master:
doc/examples: misc Doxygen markup improvements
Conflicts:
doc/examples/muxing.c
doc/examples/transcode_aac.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
* commit '3a26ccbf0d9f806d067e76a3f484170abecb36b3':
build: doxy: Include code examples in Doxygen documentation
Conflicts:
doc/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
* commit '19d3127867f001d007f98bc8c5a85c5409abf788':
doxygen: Set EXAMPLE_PATH from within doxy-wrapper.sh
Conflicts:
doc/Doxyfile
doc/doxy-wrapper.sh
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
* commit 'f1f42cfc66804907d1df9231469e4296472bb0f5':
build: Do not pass HTML snippets and stylesheet as input to Doxygen
Conflicts:
doc/Makefile
See: 0f378d86321e4d14153a28d5e74c3ff0f99b1a20
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
* commit 'e6c175dfd51e4b0e6deeae72cd8a161b22af3492':
Doxyfile: Only set HTML_{HEADER|FOOTER|STYLESHEET} from doxy_wrapper.sh
Conflicts:
doc/Doxyfile
See: 7d0ca5b7e43676cc23834ccd19d40744f7328b77
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
Add properly formatted @example tag and fix Doxygen syntax.
|
|
|
|
This allows using the libav source path as the example path.
|
|
These files are referenced elsewhere and only generate warnings if
presented to Doxygen as input files.
|
|
|
|
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
|
|
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
|
|
|
|
Entries that have no hash at all are not filled in
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
|
* qatar/master:
build: fix examples compilation when EXESUF is not empty
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
* commit 'b36bc81ccaa2fc85dc4bae7dc546c71e8833573d':
avplay: add support for seeking to chapter marks
Conflicts:
doc/ffplay.texi
ffplay.c
ffplay uses pageup/down for seeking by +-10min
thus this use of the keys conflicts.
The merge thus uses them to seek to chapters when there are some or
+-10min when there are not
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|