diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-18 19:26:46 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-18 22:54:18 +0100 |
| commit | 27d39c225bb35e25431f562160cf28f3aacdb3c7 (patch) | |
| tree | 474a76c857b5262dd624a4e6a6d28d47d13e945e | |
| parent | 0df7d95a5e531874cab5745517934069f6a6f4dd (diff) | |
| download | ffmpeg-27d39c225bb35e25431f562160cf28f3aacdb3c7.tar.gz | |
liavfi/avcodec: allow channel layouts with fewer channels than actually available.
This fixes the regression with Ticket1726, where some audio was lost.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavfilter/avcodec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavfilter/avcodec.c b/libavfilter/avcodec.c index 5ace9d9686..30b8258eb6 100644 --- a/libavfilter/avcodec.c +++ b/libavfilter/avcodec.c @@ -61,7 +61,7 @@ int avfilter_copy_frame_props(AVFilterBufferRef *dst, const AVFrame *src) dst->audio->sample_rate = src->sample_rate; dst->audio->channel_layout = src->channel_layout; dst->audio->channels = src->channels; - if(src->channels != av_get_channel_layout_nb_channels(src->channel_layout)) { + if(src->channels < av_get_channel_layout_nb_channels(src->channel_layout)) { av_log(0, AV_LOG_ERROR, "libavfilter does not support this channel layout\n"); return AVERROR(EINVAL); } |