diff options
| author | Clément Bœsch <ubitux@gmail.com> | 2012-11-19 18:46:05 +0100 |
|---|---|---|
| committer | Clément Bœsch <ubitux@gmail.com> | 2012-11-19 18:49:14 +0100 |
| commit | c02ae4827191d6da702c7baceccfa63929721a0b (patch) | |
| tree | 2d2d2e0b5b5447b0267c82db0d8225a2d2b5c7f5 /libswresample | |
| parent | 19660a887677bdf22593cb89753f13db7f525358 (diff) | |
| download | ffmpeg-c02ae4827191d6da702c7baceccfa63929721a0b.tar.gz | |
swr: set default channel count options to 0.
If not set, they will be defined using the channel layout setting, which
is much more convenient when using swr_alloc() instead of
swr_alloc_set_opts().
Diffstat (limited to 'libswresample')
| -rw-r--r-- | libswresample/swresample.c | 8 | ||||
| -rw-r--r-- | libswresample/version.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/libswresample/swresample.c b/libswresample/swresample.c index 041d2b2319..28388b57a1 100644 --- a/libswresample/swresample.c +++ b/libswresample/swresample.c @@ -41,10 +41,10 @@ #define PARAM AV_OPT_FLAG_AUDIO_PARAM static const AVOption options[]={ -{"ich" , "set input channel count" , OFFSET( in.ch_count ), AV_OPT_TYPE_INT , {.i64=2 }, 0 , SWR_CH_MAX, PARAM}, -{"in_channel_count" , "set input channel count" , OFFSET( in.ch_count ), AV_OPT_TYPE_INT , {.i64=2 }, 0 , SWR_CH_MAX, PARAM}, -{"och" , "set output channel count" , OFFSET(out.ch_count ), AV_OPT_TYPE_INT , {.i64=2 }, 0 , SWR_CH_MAX, PARAM}, -{"out_channel_count" , "set output channel count" , OFFSET(out.ch_count ), AV_OPT_TYPE_INT , {.i64=2 }, 0 , SWR_CH_MAX, PARAM}, +{"ich" , "set input channel count" , OFFSET( in.ch_count ), AV_OPT_TYPE_INT , {.i64=0 }, 0 , SWR_CH_MAX, PARAM}, +{"in_channel_count" , "set input channel count" , OFFSET( in.ch_count ), AV_OPT_TYPE_INT , {.i64=0 }, 0 , SWR_CH_MAX, PARAM}, +{"och" , "set output channel count" , OFFSET(out.ch_count ), AV_OPT_TYPE_INT , {.i64=0 }, 0 , SWR_CH_MAX, PARAM}, +{"out_channel_count" , "set output channel count" , OFFSET(out.ch_count ), AV_OPT_TYPE_INT , {.i64=0 }, 0 , SWR_CH_MAX, PARAM}, {"uch" , "set used channel count" , OFFSET(used_ch_count ), AV_OPT_TYPE_INT , {.i64=0 }, 0 , SWR_CH_MAX, PARAM}, {"used_channel_count" , "set used channel count" , OFFSET(used_ch_count ), AV_OPT_TYPE_INT , {.i64=0 }, 0 , SWR_CH_MAX, PARAM}, {"isr" , "set input sample rate" , OFFSET( in_sample_rate), AV_OPT_TYPE_INT , {.i64=0 }, 0 , INT_MAX , PARAM}, diff --git a/libswresample/version.h b/libswresample/version.h index 2c7b932818..fe747ebf01 100644 --- a/libswresample/version.h +++ b/libswresample/version.h @@ -29,7 +29,7 @@ #include "libavutil/avutil.h" #define LIBSWRESAMPLE_VERSION_MAJOR 0 -#define LIBSWRESAMPLE_VERSION_MINOR 16 +#define LIBSWRESAMPLE_VERSION_MINOR 17 #define LIBSWRESAMPLE_VERSION_MICRO 100 #define LIBSWRESAMPLE_VERSION_INT AV_VERSION_INT(LIBSWRESAMPLE_VERSION_MAJOR, \ |