---
libavcodec/alac.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/libavcodec/alac.c b/libavcodec/alac.c
index 13607b3..016741b 100644
--- a/libavcodec/alac.c
+++ b/libavcodec/alac.c
@@ -593,7 +593,6 @@ static int alac_set_info(ALACContext *alac)
static av_cold int alac_decode_init(AVCodecContext * avctx)
{
int ret;
- int req_packed;
ALACContext *alac = avctx->priv_data;
alac->avctx = avctx;
@@ -607,12 +606,11 @@ static av_cold int alac_decode_init(AVCodecContext *
avctx)
return -1;
}
- req_packed = LIBAVCODEC_VERSION_MAJOR < 55 &&
!av_sample_fmt_is_planar(avctx->request_sample_fmt);
switch (alac->sample_size) {
- case 16: avctx->sample_fmt = req_packed ? AV_SAMPLE_FMT_S16 :
AV_SAMPLE_FMT_S16P;
+ case 16: avctx->sample_fmt = AV_SAMPLE_FMT_S16P;
break;
case 24:
- case 32: avctx->sample_fmt = req_packed ? AV_SAMPLE_FMT_S32 :
AV_SAMPLE_FMT_S32P;
+ case 32: avctx->sample_fmt = AV_SAMPLE_FMT_S32P;
break;
default: avpriv_request_sample(avctx, "Sample depth %d",
alac->sample_size);
return AVERROR_PATCHWELCOME;
--
2.5.1.windows.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
