diff mbox

[FFmpeg-devel,v2] avformat/mxfenc: fix warning: unused function 'klv_ber_length' [-Wunused-function]

Message ID 20190829084401.24765-1-lance.lmwang@gmail.com
State Accepted
Commit 787c56b9e9e5f9a1b82d2b47f26e8b0924781599
Headers show

Commit Message

Lance Wang Aug. 29, 2019, 8:44 a.m. UTC 
From: Limin Wang <lance.lmwang@gmail.com>

Signed-off-by: Limin Wang <lance.lmwang@gmail.com>
---
 libavformat/mxfenc.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

Comments

Tomas Härdin Aug. 30, 2019, 6:42 a.m. UTC | #1 
tor 2019-08-29 klockan 16:44 +0800 skrev lance.lmwang@gmail.com:
> From: Limin Wang <lance.lmwang@gmail.com>
> 
> Signed-off-by: Limin Wang <lance.lmwang@gmail.com>
> ---
>  libavformat/mxfenc.c | 7 +++----
>  1 file changed, 3 insertions(+), 4 deletions(-)
> 
> diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c
> index 8b3d599a6f..aa23ee3947 100644
> --- a/libavformat/mxfenc.c
> +++ b/libavformat/mxfenc.c
> @@ -553,15 +553,14 @@ static int klv_ber_length(uint64_t len)
>  static int klv_encode_ber_length(AVIOContext *pb, uint64_t len)
>  {
>      // Determine the best BER size
> -    int size;
> -    if (len < 128) {
> +    int size = klv_ber_length(len);
> +    if (size == 1) {
>          //short form
>          avio_w8(pb, len);
>          return 1;
>      }
>  
> -    size = (av_log2(len) >> 3) + 1;
> -
> +    size --;

Looks good to me. I'll push some time this weekend unless someone
objects

/Tomas
Lance Wang Sept. 4, 2019, 2:27 p.m. UTC | #2 
On Fri, Aug 30, 2019 at 08:42:08AM +0200, Tomas Härdin wrote:
> tor 2019-08-29 klockan 16:44 +0800 skrev lance.lmwang@gmail.com:
> > From: Limin Wang <lance.lmwang@gmail.com>
> > 
> > Signed-off-by: Limin Wang <lance.lmwang@gmail.com>
> > ---
> >  libavformat/mxfenc.c | 7 +++----
> >  1 file changed, 3 insertions(+), 4 deletions(-)
> > 
> > diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c
> > index 8b3d599a6f..aa23ee3947 100644
> > --- a/libavformat/mxfenc.c
> > +++ b/libavformat/mxfenc.c
> > @@ -553,15 +553,14 @@ static int klv_ber_length(uint64_t len)
> >  static int klv_encode_ber_length(AVIOContext *pb, uint64_t len)
> >  {
> >      // Determine the best BER size
> > -    int size;
> > -    if (len < 128) {
> > +    int size = klv_ber_length(len);
> > +    if (size == 1) {
> >          //short form
> >          avio_w8(pb, len);
> >          return 1;
> >      }
> >  
> > -    size = (av_log2(len) >> 3) + 1;
> > -
> > +    size --;
> 
> Looks good to me. I'll push some time this weekend unless someone
> objects

Tomas，please help to push the patch.

> 
> /Tomas
> 
> _______________________________________________
> 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".
Tomas Härdin Sept. 4, 2019, 5:13 p.m. UTC | #3 
ons 2019-09-04 klockan 22:27 +0800 skrev Limin Wang:
> On Fri, Aug 30, 2019 at 08:42:08AM +0200, Tomas Härdin wrote:
> > tor 2019-08-29 klockan 16:44 +0800 skrev lance.lmwang@gmail.com:
> > > From: Limin Wang <lance.lmwang@gmail.com>
> > > 
> > > Signed-off-by: Limin Wang <lance.lmwang@gmail.com>
> > > ---
> > >  libavformat/mxfenc.c | 7 +++----
> > >  1 file changed, 3 insertions(+), 4 deletions(-)
> > > 
> > > diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c
> > > index 8b3d599a6f..aa23ee3947 100644
> > > --- a/libavformat/mxfenc.c
> > > +++ b/libavformat/mxfenc.c
> > > @@ -553,15 +553,14 @@ static int klv_ber_length(uint64_t len)
> > >  static int klv_encode_ber_length(AVIOContext *pb, uint64_t len)
> > >  {
> > >      // Determine the best BER size
> > > -    int size;
> > > -    if (len < 128) {
> > > +    int size = klv_ber_length(len);
> > > +    if (size == 1) {
> > >          //short form
> > >          avio_w8(pb, len);
> > >          return 1;
> > >      }
> > >  
> > > -    size = (av_log2(len) >> 3) + 1;
> > > -
> > > +    size --;
> > 
> > Looks good to me. I'll push some time this weekend unless someone
> > objects
> 
> Tomas，please help to push the patch.

Done. Sorry about the delay

/Tomas
diff mbox

Patch

diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c
index 8b3d599a6f..aa23ee3947 100644
--- a/libavformat/mxfenc.c
+++ b/libavformat/mxfenc.c
@@ -553,15 +553,14 @@  static int klv_ber_length(uint64_t len)
 static int klv_encode_ber_length(AVIOContext *pb, uint64_t len)
 {
     // Determine the best BER size
-    int size;
-    if (len < 128) {
+    int size = klv_ber_length(len);
+    if (size == 1) {
         //short form
         avio_w8(pb, len);
         return 1;
     }
 
-    size = (av_log2(len) >> 3) + 1;
-
+    size --;
     // long form
     avio_w8(pb, 0x80 + size);
     while(size) {