diff options
Diffstat (limited to 'audio/decode/ad_spdif.c')
-rw-r--r-- | audio/decode/ad_spdif.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/audio/decode/ad_spdif.c b/audio/decode/ad_spdif.c index 3c5e0ef6e1..bb39298dd6 100644 --- a/audio/decode/ad_spdif.c +++ b/audio/decode/ad_spdif.c @@ -117,13 +117,13 @@ static int init(struct dec_audio *da, const char *decoder) switch (stream->codec->codec_id) { case AV_CODEC_ID_AAC: spdif_ctx->iec61937_packet_size = 16384; - sample_format = AF_FORMAT_IEC61937; + sample_format = AF_FORMAT_S_AAC; samplerate = 48000; num_channels = 2; break; case AV_CODEC_ID_AC3: spdif_ctx->iec61937_packet_size = 6144; - sample_format = AF_FORMAT_AC3; + sample_format = AF_FORMAT_S_AC3; samplerate = 48000; num_channels = 2; break; @@ -131,31 +131,31 @@ static int init(struct dec_audio *da, const char *decoder) if (da->opts->dtshd) { av_dict_set(&format_opts, "dtshd_rate", "768000", 0); // 4*192000 spdif_ctx->iec61937_packet_size = 32768; - sample_format = AF_FORMAT_IEC61937; + sample_format = AF_FORMAT_S_DTSHD; samplerate = 192000; num_channels = 2*4; } else { spdif_ctx->iec61937_packet_size = 32768; - sample_format = AF_FORMAT_AC3; + sample_format = AF_FORMAT_S_DTS; samplerate = 48000; num_channels = 2; } break; case AV_CODEC_ID_EAC3: spdif_ctx->iec61937_packet_size = 24576; - sample_format = AF_FORMAT_IEC61937; + sample_format = AF_FORMAT_S_EAC3; samplerate = 192000; num_channels = 2; break; case AV_CODEC_ID_MP3: spdif_ctx->iec61937_packet_size = 4608; - sample_format = AF_FORMAT_MPEG2; + sample_format = AF_FORMAT_S_MP3; samplerate = 48000; num_channels = 2; break; case AV_CODEC_ID_TRUEHD: spdif_ctx->iec61937_packet_size = 61440; - sample_format = AF_FORMAT_IEC61937; + sample_format = AF_FORMAT_S_TRUEHD; samplerate = 192000; num_channels = 8; break; |