diff options
| author | Stefano Sabatini <stefasab@gmail.com> | 2013-10-04 15:20:50 +0200 |
|---|---|---|
| committer | Stefano Sabatini <stefasab@gmail.com> | 2013-10-17 18:03:09 +0200 |
| commit | d96e377c394cc4664a91bfd2c24bbb80f42ea8de (patch) | |
| tree | 7bbb96f5c2d7cd91b28f187f38764b25a722534d /libavutil/internal.h | |
| parent | b236eb49e1a19006185193563b6c2b5c3edc5ed3 (diff) | |
| download | ffmpeg-d96e377c394cc4664a91bfd2c24bbb80f42ea8de.tar.gz | |
lavu/channel_layout: change av_get_channel_layout() behavior at the next bump
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.
Diffstat (limited to 'libavutil/internal.h')
| -rw-r--r-- | libavutil/internal.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavutil/internal.h b/libavutil/internal.h index 6bc426e925..68108769a6 100644 --- a/libavutil/internal.h +++ b/libavutil/internal.h @@ -39,6 +39,7 @@ #include "timer.h" #include "cpu.h" #include "dict.h" +#include "version.h" #if ARCH_X86 # include "x86/emms.h" @@ -219,4 +220,8 @@ void avpriv_request_sample(void *avc, */ int avpriv_open(const char *filename, int flags, ...); +#if FF_API_GET_CHANNEL_LAYOUT_COMPAT +uint64_t ff_get_channel_layout(const char *name, int compat); +#endif + #endif /* AVUTIL_INTERNAL_H */ |