MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2024-12-28 16:15:57 -05:00
Code Issues Packages Projects Releases Wiki Activity

libav 0.7: Switch from av_get_bits_per_sample_format() to ..._fmt()

Browse Source
This commit is contained in:
Julien BLACHE 2011-06-02 17:42:30 +02:00
parent ecf064082f
commit b1d31feb53
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/filescanner_ffmpeg.c
View File

@ -402,7 +402,11 @@ scan_metadata_ffmpeg(char *file, struct media_file_info *mfi)
mfi->samplerate = audio_stream->codec->sample_rate; mfi->samplerate = audio_stream->codec->sample_rate;
/* Try sample format first */ /* Try sample format first */
#if LIBAVCODEC_VERSION_MAJOR >= 53
mfi->bits_per_sample = av_get_bits_per_sample_fmt(audio_stream->codec->sample_fmt);
#else
mfi->bits_per_sample = av_get_bits_per_sample_format(audio_stream->codec->sample_fmt); mfi->bits_per_sample = av_get_bits_per_sample_format(audio_stream->codec->sample_fmt);
#endif
if (mfi->bits_per_sample == 0) if (mfi->bits_per_sample == 0)
{ {
/* Try codec */ /* Try codec */

4
src/transcode.c
View File

@ -450,7 +450,11 @@ transcode_setup(struct media_file_info *mfi, off_t *est_size, int wavhdr)
} }
ctx->need_resample = 1; ctx->need_resample = 1;
#if LIBAVCODEC_VERSION_MAJOR >= 53
ctx->input_size = ctx->acodec->channels * av_get_bits_per_sample_fmt(ctx->acodec->sample_fmt) / 8;
#else
ctx->input_size = ctx->acodec->channels * av_get_bits_per_sample_format(ctx->acodec->sample_fmt) / 8; ctx->input_size = ctx->acodec->channels * av_get_bits_per_sample_format(ctx->acodec->sample_fmt) / 8;
#endif
} }
ctx->duration = mfi->song_length; ctx->duration = mfi->song_length;