Mercurial > libavcodec.hg

comparison mpegaudiodec.c @ 8598:6550218be3b7 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
simplify: group all the AUDIO_NONSHORT parameters in the same place
author aurel
date Wed, 14 Jan 2009 21:41:05 +0000
parents c5349ca95c08
children 04423b2f6e0b
comparison
equal deleted inserted replaced
8597:573d2361d2ec 8598:6550218be3b7
314 static int init=0; 314 static int init=0;
315 int i, j, k; 315 int i, j, k;
316 316
317 s->avctx = avctx; 317 s->avctx = avctx;
318 318
319 #if CONFIG_MPEGAUDIO_HP && CONFIG_AUDIO_NONSHORT 319 avctx->sample_fmt= OUT_FMT;
320 avctx->sample_fmt= SAMPLE_FMT_S32;
321 #else
322 avctx->sample_fmt= SAMPLE_FMT_S16;
323 #endif
324 s->error_recognition= avctx->error_recognition; 320 s->error_recognition= avctx->error_recognition;
325 321
326 if(avctx->antialias_algo != FF_AA_FLOAT) 322 if(avctx->antialias_algo != FF_AA_FLOAT)
327 s->compute_antialias= compute_antialias_integer; 323 s->compute_antialias= compute_antialias_integer;
328 else 324 else