RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-19 21:36:54 +00:00
Code Issues Projects Releases Wiki Activity

avcodec/mlpenc: Remove dead channel layout checks

Browse Source 
ff_encode_preinit() has already checked that the channel layout
is equivalent to one of the layouts in AVCodec.ch_layouts.

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt 2022-09-17 23:49:57 +02:00
parent a12338afe5
commit 65dbc83eec
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavcodec/mlpenc.c
View File

@ -27,6 +27,7 @@
#include "encode.h"
#include "put_bits.h"
#include "audio_frame_queue.h"
#include "libavutil/avassert.h"
#include "libavutil/channel_layout.h"
#include "libavutil/crc.h"
#include "libavutil/avstring.h"
@ -602,12 +603,11 @@ static av_cold int mlp_encode_init(AVCodecContext *avctx)
};
int i;
for (i = 0; i < FF_ARRAY_ELEMS(layout_arrangement); i++)
for (i = 0;; i++) {
av_assert1(i < FF_ARRAY_ELEMS(layout_arrangement) ||
!"Impossible channel layout");
if (channels_present == layout_arrangement[i])
break;
if (i == FF_ARRAY_ELEMS(layout_arrangement)) {
av_log(avctx, AV_LOG_ERROR, "Unsupported channel arrangement\n");
return AVERROR(EINVAL);
}
ctx->channel_arrangement = i;
ctx->flags = FLAGS_DVDA;
@ -640,8 +640,7 @@ static av_cold int mlp_encode_init(AVCodecContext *avctx)
ctx->channel_arrangement = 15;
ctx->thd_substream_info = 0x104;
} else {
av_log(avctx, AV_LOG_ERROR, "Unsupported channel arrangement\n");
return AVERROR(EINVAL);
av_assert1(!"AVCodec.ch_layouts needs to be updated");
}
ctx->flags = 0;
ctx->channel_occupancy = 0;