diff mbox series

[FFmpeg-devel,3/3] avcodec/adpcm: Remove setting min_channel to value it is already set to

Message ID 20240726210832.288597-3-michael@niedermayer.cc
State New
Headers show
Series [FFmpeg-devel,1/3] avformat/mov: Check sample_sizes before using it | expand

Checks

Context Check Description
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished

Commit Message

Michael Niedermayer July 26, 2024, 9:08 p.m. UTC 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 libavcodec/adpcm.c | 4 ----
 1 file changed, 4 deletions(-)

Comments

Peter Ross July 27, 2024, 11:17 a.m. UTC | #1 
On Fri, Jul 26, 2024 at 11:08:32PM +0200, Michael Niedermayer wrote:
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
>  libavcodec/adpcm.c | 4 ----
>  1 file changed, 4 deletions(-)
> 
> diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c
> index 8f9a8a8c8e2..6c53d0bcf39 100644
> --- a/libavcodec/adpcm.c
> +++ b/libavcodec/adpcm.c
> @@ -260,10 +260,6 @@ static av_cold int adpcm_decode_init(AVCodecContext * avctx)
>      case AV_CODEC_ID_ADPCM_IMA_AMV:
>          max_channels = 1;
>          break;
> -    case AV_CODEC_ID_ADPCM_DTK:
> -    case AV_CODEC_ID_ADPCM_EA:
> -        min_channels = 1;
> -        break;
>      case AV_CODEC_ID_ADPCM_AFC:
>      case AV_CODEC_ID_ADPCM_EA_R1:
>      case AV_CODEC_ID_ADPCM_EA_R2:
> -- 
> 2.45.2

please apply.

-- Peter
(A907 E02F A6E5 0CD2 34CD 20D2 6760 79C5 AC40 DD6B)
Michael Niedermayer July 27, 2024, 10 p.m. UTC | #2 
On Sat, Jul 27, 2024 at 09:17:01PM +1000, Peter Ross wrote:
> On Fri, Jul 26, 2024 at 11:08:32PM +0200, Michael Niedermayer wrote:
> > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> > ---
> >  libavcodec/adpcm.c | 4 ----
> >  1 file changed, 4 deletions(-)
> > 
> > diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c
> > index 8f9a8a8c8e2..6c53d0bcf39 100644
> > --- a/libavcodec/adpcm.c
> > +++ b/libavcodec/adpcm.c
> > @@ -260,10 +260,6 @@ static av_cold int adpcm_decode_init(AVCodecContext * avctx)
> >      case AV_CODEC_ID_ADPCM_IMA_AMV:
> >          max_channels = 1;
> >          break;
> > -    case AV_CODEC_ID_ADPCM_DTK:
> > -    case AV_CODEC_ID_ADPCM_EA:
> > -        min_channels = 1;
> > -        break;
> >      case AV_CODEC_ID_ADPCM_AFC:
> >      case AV_CODEC_ID_ADPCM_EA_R1:
> >      case AV_CODEC_ID_ADPCM_EA_R2:
> > -- 
> > 2.45.2
> 
> please apply.

will apply

thx

[...]
diff mbox series

Patch

diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c
index 8f9a8a8c8e2..6c53d0bcf39 100644
--- a/libavcodec/adpcm.c
+++ b/libavcodec/adpcm.c
@@ -260,10 +260,6 @@  static av_cold int adpcm_decode_init(AVCodecContext * avctx)
     case AV_CODEC_ID_ADPCM_IMA_AMV:
         max_channels = 1;
         break;
-    case AV_CODEC_ID_ADPCM_DTK:
-    case AV_CODEC_ID_ADPCM_EA:
-        min_channels = 1;
-        break;
     case AV_CODEC_ID_ADPCM_AFC:
     case AV_CODEC_ID_ADPCM_EA_R1:
     case AV_CODEC_ID_ADPCM_EA_R2: