diff mbox

[FFmpeg-devel,05/12] opusdec: Remove dead code

Message ID 20170706182842.7785-6-derek.buitenhuis@gmail.com
State Accepted
Commit 179bf86fa2f5f24d12e625c58ca08223a1e32093
Headers show

Commit Message

Derek Buitenhuis July 6, 2017, 6:28 p.m. UTC 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
---
 libavcodec/opusdec.c | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

Comments

Rostislav Pehlivanov July 6, 2017, 9:02 p.m. UTC | #1 
On 6 July 2017 at 19:28, Derek Buitenhuis <derek.buitenhuis@gmail.com>
wrote:

> Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
> ---
>  libavcodec/opusdec.c | 9 +--------
>  1 file changed, 1 insertion(+), 8 deletions(-)
>
> diff --git a/libavcodec/opusdec.c b/libavcodec/opusdec.c
> index 1110302f9c..5a7ba9dbb4 100644
> --- a/libavcodec/opusdec.c
> +++ b/libavcodec/opusdec.c
> @@ -152,14 +152,7 @@ static int opus_init_resample(OpusStreamContext *s)
>
>  static int opus_decode_redundancy(OpusStreamContext *s, const uint8_t
> *data, int size)
>  {
> -    int ret;
> -    enum OpusBandwidth bw = s->packet.bandwidth;
> -
> -    if (s->packet.mode == OPUS_MODE_SILK &&
> -        bw == OPUS_BANDWIDTH_MEDIUMBAND)
> -        bw = OPUS_BANDWIDTH_WIDEBAND;
> -
> -    ret = ff_opus_rc_dec_init(&s->redundancy_rc, data, size);
> +    int ret = ff_opus_rc_dec_init(&s->redundancy_rc, data, size);
>      if (ret < 0)
>          goto fail;
>      ff_opus_rc_dec_raw_init(&s->redundancy_rc, data + size, size);
> --
> 2.11.0
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>

LGTM, thanks
diff mbox

Patch

diff --git a/libavcodec/opusdec.c b/libavcodec/opusdec.c
index 1110302f9c..5a7ba9dbb4 100644
--- a/libavcodec/opusdec.c
+++ b/libavcodec/opusdec.c
@@ -152,14 +152,7 @@  static int opus_init_resample(OpusStreamContext *s)
 
 static int opus_decode_redundancy(OpusStreamContext *s, const uint8_t *data, int size)
 {
-    int ret;
-    enum OpusBandwidth bw = s->packet.bandwidth;
-
-    if (s->packet.mode == OPUS_MODE_SILK &&
-        bw == OPUS_BANDWIDTH_MEDIUMBAND)
-        bw = OPUS_BANDWIDTH_WIDEBAND;
-
-    ret = ff_opus_rc_dec_init(&s->redundancy_rc, data, size);
+    int ret = ff_opus_rc_dec_init(&s->redundancy_rc, data, size);
     if (ret < 0)
         goto fail;
     ff_opus_rc_dec_raw_init(&s->redundancy_rc, data + size, size);