Mercurial > libavcodec.hg

comparison mpegaudiodec.c @ 8594:c5349ca95c08 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Replace #ifdef CONFIG_ preprocessor check by #if CONFIG_. CONFIG_ changed semantics and is always defined now.
author diego
date Wed, 14 Jan 2009 07:57:12 +0000
parents 9aac5b3cecbd
children 6550218be3b7
comparison
equal deleted inserted replaced
8593:7de1d00618e4 8594:c5349ca95c08
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 defined(CONFIG_MPEGAUDIO_HP) && defined(CONFIG_AUDIO_NONSHORT) 319 #if CONFIG_MPEGAUDIO_HP && CONFIG_AUDIO_NONSHORT
320 avctx->sample_fmt= SAMPLE_FMT_S32; 320 avctx->sample_fmt= SAMPLE_FMT_S32;
321 #else 321 #else
322 avctx->sample_fmt= SAMPLE_FMT_S16; 322 avctx->sample_fmt= SAMPLE_FMT_S16;
323 #endif 323 #endif
324 s->error_recognition= avctx->error_recognition; 324 s->error_recognition= avctx->error_recognition;