MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-01-26 22:23:17 -05:00
Code Issues Packages Projects Releases Wiki Activity

libav 0.7: use av_get_bytes_per_sample() instead of av_get_bits_per_sample_fmt()

Browse Source
This commit is contained in:
Julien BLACHE 2011-09-10 12:20:15 +02:00
parent bb8f9de8ec
commit ed20d3f7de
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/filescanner_ffmpeg.c
View File

@ -410,7 +410,9 @@ scan_metadata_ffmpeg(char *file, struct media_file_info *mfi)
mfi->samplerate = audio_stream->codec->sample_rate;
/* Try sample format first */
#if LIBAVCODEC_VERSION_MAJOR >= 53
#if LIBAVUTIL_VERSION_MAJOR >= 51 || (LIBAVUTIL_VERSION_MAJOR == 51 && LIBAVUTIL_VERSION_MINOR >= 4)
mfi->bits_per_sample = 8 * av_get_bytes_per_sample(audio_stream->codec->sample_fmt);
#elif 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);

4
src/transcode.c
View File

@ -454,7 +454,9 @@ transcode_setup(struct media_file_info *mfi, off_t *est_size, int wavhdr)
}
ctx->need_resample = 1;
#if LIBAVCODEC_VERSION_MAJOR >= 53
#if LIBAVUTIL_VERSION_MAJOR >= 51 || (LIBAVUTIL_VERSION_MAJOR == 51 && LIBAVUTIL_VERSION_MINOR >= 4)
ctx->input_size = ctx->acodec->channels * av_get_bytes_per_sample(ctx->acodec->sample_fmt);
#elif 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;