[FFmpeg-devel,v3] avformat/flvdec: delete unused code

Submitted by Leo Zhang on Aug. 14, 2019, 3:07 a.m.

Details

Message ID 1565752038-86411-1-git-send-email-leozhang@qiyi.com
State New
Headers show

Commit Message

Leo Zhang Aug. 14, 2019, 3:07 a.m.
Reviewed-by: Carl Eugen Hoyos <ceffmpeg@gmail.com>
Signed-off-by: leozhang <leozhang@qiyi.com>
---
 libavformat/flvdec.c | 17 -----------------
 1 file changed, 17 deletions(-)

Comments

UsingtcNower Aug. 16, 2019, 4:11 p.m.
ping.

leozhang <leozhang@qiyi.com> 于2019年8月14日周三 上午11:07写道:
>
> Reviewed-by: Carl Eugen Hoyos <ceffmpeg@gmail.com>
> Signed-off-by: leozhang <leozhang@qiyi.com>
> ---
>  libavformat/flvdec.c | 17 -----------------
>  1 file changed, 17 deletions(-)
>
> diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c
> index b531a39..6bfe624 100644
> --- a/libavformat/flvdec.c
> +++ b/libavformat/flvdec.c
> @@ -32,7 +32,6 @@
>  #include "libavutil/mathematics.h"
>  #include "libavutil/time_internal.h"
>  #include "libavcodec/bytestream.h"
> -#include "libavcodec/mpeg4audio.h"
>  #include "avformat.h"
>  #include "internal.h"
>  #include "avio_internal.h"
> @@ -1265,22 +1264,6 @@ retry_duration:
>              if (st->codecpar->codec_id == AV_CODEC_ID_AAC && t && !strcmp(t->value, "Omnia A/XE"))
>                  st->codecpar->extradata_size = 2;
>
> -            if (st->codecpar->codec_id == AV_CODEC_ID_AAC && 0) {
> -                MPEG4AudioConfig cfg;
> -
> -                if (avpriv_mpeg4audio_get_config(&cfg, st->codecpar->extradata,
> -                                                 st->codecpar->extradata_size * 8, 1) >= 0) {
> -                st->codecpar->channels       = cfg.channels;
> -                st->codecpar->channel_layout = 0;
> -                if (cfg.ext_sample_rate)
> -                    st->codecpar->sample_rate = cfg.ext_sample_rate;
> -                else
> -                    st->codecpar->sample_rate = cfg.sample_rate;
> -                av_log(s, AV_LOG_TRACE, "mp4a config channels %d sample rate %d\n",
> -                        st->codecpar->channels, st->codecpar->sample_rate);
> -                }
> -            }
> -
>              ret = FFERROR_REDO;
>              goto leave;
>          }
> --
> 1.8.3.1
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
Michael Niedermayer Aug. 18, 2019, 9:49 a.m.
On Wed, Aug 14, 2019 at 11:07:18AM +0800, leozhang wrote:
> Reviewed-by: Carl Eugen Hoyos <ceffmpeg@gmail.com>
> Signed-off-by: leozhang <leozhang@qiyi.com>
> ---
>  libavformat/flvdec.c | 17 -----------------
>  1 file changed, 17 deletions(-)

probably ok

thx
[...]
UsingtcNower Aug. 22, 2019, 10:55 a.m.
Michael Niedermayer <michael@niedermayer.cc> 于2019年8月18日周日 下午5:49写道:
>
> On Wed, Aug 14, 2019 at 11:07:18AM +0800, leozhang wrote:
> > Reviewed-by: Carl Eugen Hoyos <ceffmpeg@gmail.com>
> > Signed-off-by: leozhang <leozhang@qiyi.com>
> > ---
> >  libavformat/flvdec.c | 17 -----------------
> >  1 file changed, 17 deletions(-)
>
> probably ok
Hi Michael, I'm sorry to bother you at your busy time and is it the
time to push it?
>
> thx
> [...]
> --
> Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB
>
> it is not once nor twice but times without number that the same ideas make
> their appearance in the world. -- Aristotle
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
Michael Niedermayer Aug. 23, 2019, 8:19 p.m.
On Thu, Aug 22, 2019 at 06:55:00PM +0800, Tao Zhang wrote:
> Michael Niedermayer <michael@niedermayer.cc> 于2019年8月18日周日 下午5:49写道:
> >
> > On Wed, Aug 14, 2019 at 11:07:18AM +0800, leozhang wrote:
> > > Reviewed-by: Carl Eugen Hoyos <ceffmpeg@gmail.com>
> > > Signed-off-by: leozhang <leozhang@qiyi.com>
> > > ---
> > >  libavformat/flvdec.c | 17 -----------------
> > >  1 file changed, 17 deletions(-)
> >
> > probably ok
> Hi Michael, I'm sorry to bother you at your busy time and is it the
> time to push it?

will apply

thx

[...]

Patch hide | download patch | download mbox

diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c
index b531a39..6bfe624 100644
--- a/libavformat/flvdec.c
+++ b/libavformat/flvdec.c
@@ -32,7 +32,6 @@ 
 #include "libavutil/mathematics.h"
 #include "libavutil/time_internal.h"
 #include "libavcodec/bytestream.h"
-#include "libavcodec/mpeg4audio.h"
 #include "avformat.h"
 #include "internal.h"
 #include "avio_internal.h"
@@ -1265,22 +1264,6 @@  retry_duration:
             if (st->codecpar->codec_id == AV_CODEC_ID_AAC && t && !strcmp(t->value, "Omnia A/XE"))
                 st->codecpar->extradata_size = 2;
 
-            if (st->codecpar->codec_id == AV_CODEC_ID_AAC && 0) {
-                MPEG4AudioConfig cfg;
-
-                if (avpriv_mpeg4audio_get_config(&cfg, st->codecpar->extradata,
-                                                 st->codecpar->extradata_size * 8, 1) >= 0) {
-                st->codecpar->channels       = cfg.channels;
-                st->codecpar->channel_layout = 0;
-                if (cfg.ext_sample_rate)
-                    st->codecpar->sample_rate = cfg.ext_sample_rate;
-                else
-                    st->codecpar->sample_rate = cfg.sample_rate;
-                av_log(s, AV_LOG_TRACE, "mp4a config channels %d sample rate %d\n",
-                        st->codecpar->channels, st->codecpar->sample_rate);
-                }
-            }
-
             ret = FFERROR_REDO;
             goto leave;
         }