summaryrefslogtreecommitdiff
path: root/libavutil/channel_layout.h
Commit message (Collapse)AuthorAge
* avutil/channel_layout: add av_get_extended_channel_layoutMarton Balint2017-01-24
| | | | | | | | | | | | | | Return a channel layout and the number of channels based on the specified name. This function is similar to av_get_channel_layout(), but can also parse unknown channel layout specifications. Unknown channel layout specifications are a decimal number and a capital 'C' suffix, in order to not break compatibility with the lowercase 'c' suffix, which is used for a guessed channel layout with the specified number of channels. Signed-off-by: Marton Balint <cus@passwd.hu>
* avutil/channel_layout: fix remains of old syntax in docs and commentsMarton Balint2017-01-24
| | | | Signed-off-by: Marton Balint <cus@passwd.hu>
* Merge commit 'e23f84d9652474353d8bbc42787a56ec1991908f'Hendrik Leppkes2015-08-24
|\ | | | | | | | | | | | | * commit 'e23f84d9652474353d8bbc42787a56ec1991908f': channel_layout: Add a 16channel default layout Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * channel_layout: Add a 16channel default layoutLuca Barbato2015-08-23
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | channel_layout: doxy: merge functions with macrosTimothy Gu2014-07-04
| | | | | | | | | | Signed-off-by: Timothy Gu <timothygu99@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '5c437fb'Michael Niedermayer2014-01-05
|\| | | | | | | | | | | | | | | | | | | | | * commit '5c437fb': lavu: Add values for various Dolby flags to the AVMatrixEncoding enum. Conflicts: doc/APIchanges libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavu: Add values for various Dolby flags to the AVMatrixEncoding enum.Tim Walker2014-01-05
| |
* | lavu/channel_layout: change av_get_channel_layout() behavior at the next bumpStefano Sabatini2013-10-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new syntax is preferred since it allows backward syntax compatibility with libswr when switching to the new option handling code with AV_OPT_TYPE_CHANNEL_LAYOUT. With the new parser the string: 1234 is interpreted as a channel layout mask, rather than as a number of channels, and thus it's compatible with the current way to set a channel layout as an integer (e.g. for the icl and ocl options) making use of integer option values. ff_get_channel_layout() with compat=0 will be used in the AV_OPT_TYPE_CHANNEL handler code. The user is encouraged to switch to the new forward compatible syntax, which requires to put a trailing "c" when specifying a layout as a number of channels.
* | lavu/channel_layout: document the semantic of layouts.Nicolas George2012-12-02
| |
* | Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88'Michael Niedermayer2012-11-12
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '97bf7c03b1338a867da52c159a2afecbdedcfa88': doc: git-howto: Leave reviewers time to react before pushing patches Include libavutil/channel_layout.h instead of libavutil/audioconvert.h lavu: rename audioconvert.* to channel_layout.* and deprecate audioconvert.h Conflicts: doc/APIchanges doc/examples/decoding_encoding.c doc/git-howto.texi ffmpeg_filter.c libavcodec/flacdec.c libavcodec/imc.c libavcodec/mpegaudiodec.c libavcodec/utils.c libavfilter/asrc_anullsrc.c libavfilter/audio.c libavfilter/avfilter.c libavfilter/avfilter.h libavfilter/avfiltergraph.c libavfilter/buffer.c libavutil/Makefile libavutil/audioconvert.h libavutil/channel_layout.c libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
* lavu: rename audioconvert.* to channel_layout.* and deprecate audioconvert.hJustin Ruggles2012-11-11