Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

swr: dont treat 32 and 24 as equal in simple copy check

Browse Source 
Fixes dithering from 32 to 24 bit

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
pull/25/head
Michael Niedermayer 12 years ago
parent 6bc4e36ba7
commit 3289670142
1 changed files with 2 additions and 1 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      libswresample/swresample.c

3
libswresample/swresample.c
Unescape View File

@ -651,7 +651,8 @@ static int swr_convert_internal(struct SwrContext *s, AudioData *out, int out_co
if(s->resample_first ? !s->rematrix : !s->resample) if(s->resample_first ? !s->rematrix : !s->resample)
preout= midbuf; preout= midbuf;
if(s->int_sample_fmt == s->out_sample_fmt && s->out.planar){ if(s->int_sample_fmt == s->out_sample_fmt && s->out.planar
&& !(s->out_sample_fmt==AV_SAMPLE_FMT_S32P && (s->dither.output_sample_bits&31))){
if(preout==in){ if(preout==in){
out_count= FFMIN(out_count, in_count); //TODO check at the end if this is needed or redundant out_count= FFMIN(out_count, in_count); //TODO check at the end if this is needed or redundant
av_assert0(s->in.planar); //we only support planar internally so it has to be, we support copying non planar though av_assert0(s->in.planar); //we only support planar internally so it has to be, we support copying non planar though

Write Preview
Loading…
Cancel
Save