Mercurial > mplayer.hg
comparison libaf/af.c @ 32142:4614728cab25
build system: Merge all FFmpeg library checks into a single FFmpeg check.
There is little point in assuming that some parts of FFmpeg might be
available without the others. Plus, mixing and matching static and
shared FFmpeg libraries was never supported.
author | diego |
---|---|
date | Mon, 13 Sep 2010 18:19:25 +0000 |
parents | 12db4ae0b3d1 |
children | f67e85fc1f7a |
comparison
equal
deleted
inserted
replaced
32141:2802b8095bf7 | 32142:4614728cab25 |
---|---|
68 #ifdef HAVE_SYS_MMAN_H | 68 #ifdef HAVE_SYS_MMAN_H |
69 &af_info_export, | 69 &af_info_export, |
70 #endif | 70 #endif |
71 &af_info_volnorm, | 71 &af_info_volnorm, |
72 &af_info_extrastereo, | 72 &af_info_extrastereo, |
73 #ifdef CONFIG_LIBAVCODEC_A | 73 #ifdef CONFIG_FFMPEG_A |
74 &af_info_lavcac3enc, | 74 &af_info_lavcac3enc, |
75 #endif | 75 #endif |
76 #ifdef CONFIG_LIBAVCODEC | 76 #ifdef CONFIG_FFMPEG |
77 &af_info_lavcresample, | 77 &af_info_lavcresample, |
78 #endif | 78 #endif |
79 &af_info_sweep, | 79 &af_info_sweep, |
80 &af_info_hrtf, | 80 &af_info_hrtf, |
81 #ifdef CONFIG_LADSPA | 81 #ifdef CONFIG_LADSPA |
468 // try to find a filter that can change samplrate | 468 // try to find a filter that can change samplrate |
469 af = af_control_any_rev(s, AF_CONTROL_RESAMPLE_RATE | AF_CONTROL_SET, | 469 af = af_control_any_rev(s, AF_CONTROL_RESAMPLE_RATE | AF_CONTROL_SET, |
470 &(s->output.rate)); | 470 &(s->output.rate)); |
471 if (!af) { | 471 if (!af) { |
472 char *resampler = "resample"; | 472 char *resampler = "resample"; |
473 #ifdef CONFIG_LIBAVCODEC | 473 #ifdef CONFIG_FFMPEG |
474 if ((AF_INIT_TYPE_MASK & s->cfg.force) == AF_INIT_SLOW) | 474 if ((AF_INIT_TYPE_MASK & s->cfg.force) == AF_INIT_SLOW) |
475 resampler = "lavcresample"; | 475 resampler = "lavcresample"; |
476 #endif | 476 #endif |
477 if((AF_INIT_TYPE_MASK & s->cfg.force) == AF_INIT_SLOW){ | 477 if((AF_INIT_TYPE_MASK & s->cfg.force) == AF_INIT_SLOW){ |
478 if(!strcmp(s->first->info->name,"format")) | 478 if(!strcmp(s->first->info->name,"format")) |
492 return -1; | 492 return -1; |
493 // Use lin int if the user wants fast | 493 // Use lin int if the user wants fast |
494 if ((AF_INIT_TYPE_MASK & s->cfg.force) == AF_INIT_FAST) { | 494 if ((AF_INIT_TYPE_MASK & s->cfg.force) == AF_INIT_FAST) { |
495 char args[32]; | 495 char args[32]; |
496 sprintf(args, "%d", s->output.rate); | 496 sprintf(args, "%d", s->output.rate); |
497 #ifdef CONFIG_LIBAVCODEC | 497 #ifdef CONFIG_FFMPEG |
498 if (strcmp(resampler, "lavcresample") == 0) | 498 if (strcmp(resampler, "lavcresample") == 0) |
499 strcat(args, ":1"); | 499 strcat(args, ":1"); |
500 else | 500 else |
501 #endif | 501 #endif |
502 strcat(args, ":0:0"); | 502 strcat(args, ":0:0"); |