diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-22 18:27:27 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-22 18:34:39 +0200 |
| commit | d4325b2fea9e2f4f4a17d0b929f12425e9c39964 (patch) | |
| tree | 50b69c98601ad9d50ee597cfb319159173238db8 /libswresample/swresample.c | |
| parent | 0dd2790df50ee4b664757374b0768dd79ab4307d (diff) | |
| download | ffmpeg-d4325b2fea9e2f4f4a17d0b929f12425e9c39964.tar.gz | |
swr: Remember previously set int_sample_format from user
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample/swresample.c')
| -rw-r--r-- | libswresample/swresample.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libswresample/swresample.c b/libswresample/swresample.c index daa1a15866..e480269d05 100644 --- a/libswresample/swresample.c +++ b/libswresample/swresample.c @@ -174,6 +174,8 @@ av_cold int swr_init(struct SwrContext *s){ s-> in_ch_layout = s-> user_in_ch_layout; s->out_ch_layout = s->user_out_ch_layout; + s->int_sample_fmt= s->user_int_sample_fmt; + if(av_get_channel_layout_nb_channels(s-> in_ch_layout) > SWR_CH_MAX) { av_log(s, AV_LOG_WARNING, "Input channel layout 0x%"PRIx64" is invalid or unsupported.\n", s-> in_ch_layout); s->in_ch_layout = 0; |