diff options
Diffstat (limited to 'audio/decode')
| -rw-r--r-- | audio/decode/ad.h | 2 | ||||
| -rw-r--r-- | audio/decode/ad_internal.h | 2 | ||||
| -rw-r--r-- | audio/decode/ad_lavc.c | 4 | ||||
| -rw-r--r-- | audio/decode/ad_mpg123.c | 2 | ||||
| -rw-r--r-- | audio/decode/ad_spdif.c | 30 |
5 files changed, 20 insertions, 20 deletions
diff --git a/audio/decode/ad.h b/audio/decode/ad.h index 3bc3e39267..0bbc11ed9b 100644 --- a/audio/decode/ad.h +++ b/audio/decode/ad.h @@ -34,7 +34,7 @@ typedef struct ad_functions int (*preinit)(sh_audio_t *sh); int (*init)(sh_audio_t *sh, const char *decoder); void (*uninit)(sh_audio_t *sh); - int (*control)(sh_audio_t *sh,int cmd,void* arg, ...); + int (*control)(sh_audio_t *sh, int cmd, void *arg); int (*decode_audio)(sh_audio_t *sh, unsigned char *buffer, int minlen, int maxlen); } ad_functions_t; diff --git a/audio/decode/ad_internal.h b/audio/decode/ad_internal.h index 7eca629fca..61bf306a5e 100644 --- a/audio/decode/ad_internal.h +++ b/audio/decode/ad_internal.h @@ -32,7 +32,7 @@ static void add_decoders(struct mp_decoder_list *list); static int init(sh_audio_t *sh, const char *decoder); static int preinit(sh_audio_t *sh); static void uninit(sh_audio_t *sh); -static int control(sh_audio_t *sh,int cmd,void* arg, ...); +static int control(sh_audio_t *sh, int cmd, void *arg); static int decode_audio(sh_audio_t *sh,unsigned char *buffer,int minlen,int maxlen); #define LIBAD_EXTERN(x) const ad_functions_t mpcodecs_ad_##x = {\ diff --git a/audio/decode/ad_lavc.c b/audio/decode/ad_lavc.c index 1f59280275..248df307d7 100644 --- a/audio/decode/ad_lavc.c +++ b/audio/decode/ad_lavc.c @@ -160,7 +160,7 @@ static int setup_format(sh_audio_t *sh_audio, int container_samplerate = sh_audio->container_out_samplerate; if (!container_samplerate && sh_audio->wf) container_samplerate = sh_audio->wf->nSamplesPerSec; - if (lavc_context->codec_id == CODEC_ID_AAC + if (lavc_context->codec_id == AV_CODEC_ID_AAC && samplerate == 2 * container_samplerate) broken_srate = true; else if (container_samplerate) @@ -310,7 +310,7 @@ static void uninit(sh_audio_t *sh) sh->context = NULL; } -static int control(sh_audio_t *sh, int cmd, void *arg, ...) +static int control(sh_audio_t *sh, int cmd, void *arg) { struct priv *ctx = sh->context; switch (cmd) { diff --git a/audio/decode/ad_mpg123.c b/audio/decode/ad_mpg123.c index 999dc2fbba..c17edc9197 100644 --- a/audio/decode/ad_mpg123.c +++ b/audio/decode/ad_mpg123.c @@ -455,7 +455,7 @@ static int decode_audio(sh_audio_t *sh, unsigned char *buf, int minlen, return bytes; } -static int control(sh_audio_t *sh, int cmd, void *arg, ...) +static int control(sh_audio_t *sh, int cmd, void *arg) { switch (cmd) { case ADCTRL_RESYNC_STREAM: diff --git a/audio/decode/ad_spdif.c b/audio/decode/ad_spdif.c index 128b1bd8a9..2101721430 100644 --- a/audio/decode/ad_spdif.c +++ b/audio/decode/ad_spdif.c @@ -73,13 +73,13 @@ static int preinit(sh_audio_t *sh) } static int codecs[] = { - CODEC_ID_AAC, - CODEC_ID_AC3, - CODEC_ID_DTS, - CODEC_ID_EAC3, - CODEC_ID_MP3, - CODEC_ID_TRUEHD, - CODEC_ID_NONE + AV_CODEC_ID_AAC, + AV_CODEC_ID_AC3, + AV_CODEC_ID_DTS, + AV_CODEC_ID_EAC3, + AV_CODEC_ID_MP3, + AV_CODEC_ID_TRUEHD, + AV_CODEC_ID_NONE }; static int init(sh_audio_t *sh, const char *decoder) @@ -149,21 +149,21 @@ static int init(sh_audio_t *sh, const char *decoder) sh->ds->buffer_pos -= in_size; switch (lavf_ctx->streams[0]->codec->codec_id) { - case CODEC_ID_AAC: + case AV_CODEC_ID_AAC: spdif_ctx->iec61937_packet_size = 16384; sh->sample_format = AF_FORMAT_IEC61937_LE; sh->samplerate = srate; sh->channels = 2; sh->i_bps = bps; break; - case CODEC_ID_AC3: + case AV_CODEC_ID_AC3: spdif_ctx->iec61937_packet_size = 6144; sh->sample_format = AF_FORMAT_AC3_LE; sh->samplerate = srate; sh->channels = 2; sh->i_bps = bps; break; - case CODEC_ID_DTS: + case AV_CODEC_ID_DTS: if(sh->opts->dtshd) { opt = av_opt_find(&lavf_ctx->oformat->priv_class, "dtshd_rate", NULL, 0, 0); @@ -185,21 +185,21 @@ static int init(sh_audio_t *sh, const char *decoder) sh->i_bps = bps; } break; - case CODEC_ID_EAC3: + case AV_CODEC_ID_EAC3: spdif_ctx->iec61937_packet_size = 24576; sh->sample_format = AF_FORMAT_IEC61937_LE; sh->samplerate = 192000; sh->channels = 2; sh->i_bps = bps; break; - case CODEC_ID_MP3: + case AV_CODEC_ID_MP3: spdif_ctx->iec61937_packet_size = 4608; sh->sample_format = AF_FORMAT_MPEG2; sh->samplerate = srate; sh->channels = 2; sh->i_bps = bps; break; - case CODEC_ID_TRUEHD: + case AV_CODEC_ID_TRUEHD: spdif_ctx->iec61937_packet_size = 61440; sh->sample_format = AF_FORMAT_IEC61937_LE; sh->samplerate = 192000; @@ -270,7 +270,7 @@ static int decode_audio(sh_audio_t *sh, unsigned char *buf, return spdif_ctx->out_buffer_len; } -static int control(sh_audio_t *sh, int cmd, void* arg, ...) +static int control(sh_audio_t *sh, int cmd, void *arg) { unsigned char *start; double pts; @@ -307,7 +307,7 @@ static void uninit(sh_audio_t *sh) static void add_decoders(struct mp_decoder_list *list) { - for (int n = 0; codecs[n] != CODEC_ID_NONE; n++) { + for (int n = 0; codecs[n] != AV_CODEC_ID_NONE; n++) { const char *format = mp_codec_from_av_codec_id(codecs[n]); if (format) { mp_add_decoder(list, "spdif", format, format, |