diff mbox series

[FFmpeg-devel] avformat/mov: fix missing line break in messages

Message ID 20200625104045.55599-1-barsnick@gmx.net
State Accepted
Headers show
Series [FFmpeg-devel] avformat/mov: fix missing line break in messages | expand

Checks

Context Check Description
andriy/default pending
andriy/make success Make finished
andriy/make_fate success Make fate finished

Commit Message

Moritz Barsnick June 25, 2020, 10:40 a.m. UTC
One of them can be triggered by https://samples.ffmpeg.org/F4V/H263_NM_f.mp4.

Signed-off-by: Moritz Barsnick <barsnick@gmx.net>
---
 libavformat/mov.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--
2.26.2

Comments

Jun Zhao June 25, 2020, 10:59 a.m. UTC | #1
On Thu, Jun 25, 2020 at 6:46 PM Moritz Barsnick <barsnick@gmx.net> wrote:
>
> One of them can be triggered by https://samples.ffmpeg.org/F4V/H263_NM_f.mp4.
>
> Signed-off-by: Moritz Barsnick <barsnick@gmx.net>
> ---
>  libavformat/mov.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/libavformat/mov.c b/libavformat/mov.c
> index adc52de947..40fff5dd7d 100644
> --- a/libavformat/mov.c
> +++ b/libavformat/mov.c
> @@ -894,7 +894,7 @@ static int mov_read_ddts(MOVContext *c, AVIOContext *pb, MOVAtom atom)
>              (frame_duration_code == 3) ? 4096 : 0;
>
>      if (channel_layout_code > 0xff) {
> -        av_log(c->fc, AV_LOG_WARNING, "Unsupported DTS audio channel layout");
> +        av_log(c->fc, AV_LOG_WARNING, "Unsupported DTS audio channel layout\n");
>      }
>      st->codecpar->channel_layout =
>              ((channel_layout_code & 0x1) ? AV_CH_FRONT_CENTER : 0) |
> @@ -5219,7 +5219,7 @@ static int mov_read_elst(MOVContext *c, AVIOContext *pb, MOVAtom atom)
>          } else {
>              edit_count = atom.size / elst_entry_size;
>              if (edit_count * elst_entry_size != atom.size) {
> -                av_log(c->fc, AV_LOG_WARNING, "ELST atom of %"PRId64" bytes, bigger than %d entries.", atom.size, edit_count);
> +                av_log(c->fc, AV_LOG_WARNING, "ELST atom of %"PRId64" bytes, bigger than %d entries.\n", atom.size, edit_count);
>              }
>          }
>      }
> --
> 2.26.2
LGTM
Moritz Barsnick July 10, 2020, 11:06 a.m. UTC | #2
On Thu, Jun 25, 2020 at 18:59:58 +0800, mypopy@gmail.com wrote:
> On Thu, Jun 25, 2020 at 6:46 PM Moritz Barsnick <barsnick@gmx.net> wrote:
> >
> > One of them can be triggered by https://samples.ffmpeg.org/F4V/H263_NM_f.mp4.
> >
> > Signed-off-by: Moritz Barsnick <barsnick@gmx.net>
> > ---
> >  libavformat/mov.c | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/libavformat/mov.c b/libavformat/mov.c
> > index adc52de947..40fff5dd7d 100644
> > --- a/libavformat/mov.c
> > +++ b/libavformat/mov.c
> > @@ -894,7 +894,7 @@ static int mov_read_ddts(MOVContext *c, AVIOContext *pb, MOVAtom atom)
> >              (frame_duration_code == 3) ? 4096 : 0;
> >
> >      if (channel_layout_code > 0xff) {
> > -        av_log(c->fc, AV_LOG_WARNING, "Unsupported DTS audio channel layout");
> > +        av_log(c->fc, AV_LOG_WARNING, "Unsupported DTS audio channel layout\n");
> >      }
> >      st->codecpar->channel_layout =
> >              ((channel_layout_code & 0x1) ? AV_CH_FRONT_CENTER : 0) |
> > @@ -5219,7 +5219,7 @@ static int mov_read_elst(MOVContext *c, AVIOContext *pb, MOVAtom atom)
> >          } else {
> >              edit_count = atom.size / elst_entry_size;
> >              if (edit_count * elst_entry_size != atom.size) {
> > -                av_log(c->fc, AV_LOG_WARNING, "ELST atom of %"PRId64" bytes, bigger than %d entries.", atom.size, edit_count);
> > +                av_log(c->fc, AV_LOG_WARNING, "ELST atom of %"PRId64" bytes, bigger than %d entries.\n", atom.size, edit_count);
> >              }
> >          }
> >      }
> LGTM

Ping for push.

Thanks,
Moritz
Gyan Doshi July 10, 2020, 11:10 a.m. UTC | #3
On 10-07-2020 04:36 pm, Moritz Barsnick wrote:
> On Thu, Jun 25, 2020 at 18:59:58 +0800, mypopy@gmail.com wrote:
>> On Thu, Jun 25, 2020 at 6:46 PM Moritz Barsnick <barsnick@gmx.net> wrote:
>>> One of them can be triggered by https://samples.ffmpeg.org/F4V/H263_NM_f.mp4.
>>>
>>> Signed-off-by: Moritz Barsnick <barsnick@gmx.net>
>>> ---
>>>   libavformat/mov.c | 4 ++--
>>>   1 file changed, 2 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/libavformat/mov.c b/libavformat/mov.c
>>> index adc52de947..40fff5dd7d 100644
>>> --- a/libavformat/mov.c
>>> +++ b/libavformat/mov.c
>>> @@ -894,7 +894,7 @@ static int mov_read_ddts(MOVContext *c, AVIOContext *pb, MOVAtom atom)
>>>               (frame_duration_code == 3) ? 4096 : 0;
>>>
>>>       if (channel_layout_code > 0xff) {
>>> -        av_log(c->fc, AV_LOG_WARNING, "Unsupported DTS audio channel layout");
>>> +        av_log(c->fc, AV_LOG_WARNING, "Unsupported DTS audio channel layout\n");
>>>       }
>>>       st->codecpar->channel_layout =
>>>               ((channel_layout_code & 0x1) ? AV_CH_FRONT_CENTER : 0) |
>>> @@ -5219,7 +5219,7 @@ static int mov_read_elst(MOVContext *c, AVIOContext *pb, MOVAtom atom)
>>>           } else {
>>>               edit_count = atom.size / elst_entry_size;
>>>               if (edit_count * elst_entry_size != atom.size) {
>>> -                av_log(c->fc, AV_LOG_WARNING, "ELST atom of %"PRId64" bytes, bigger than %d entries.", atom.size, edit_count);
>>> +                av_log(c->fc, AV_LOG_WARNING, "ELST atom of %"PRId64" bytes, bigger than %d entries.\n", atom.size, edit_count);
>>>               }
>>>           }
>>>       }
>> LGTM
> Ping for push.

Within a day.

Gyan
Gyan Doshi July 12, 2020, 3:12 p.m. UTC | #4
On 10-07-2020 04:40 pm, Gyan Doshi wrote:
>
>
> On 10-07-2020 04:36 pm, Moritz Barsnick wrote:
>> On Thu, Jun 25, 2020 at 18:59:58 +0800, mypopy@gmail.com wrote:
>>> On Thu, Jun 25, 2020 at 6:46 PM Moritz Barsnick <barsnick@gmx.net> 
>>> wrote:
>>>> One of them can be triggered by 
>>>> https://samples.ffmpeg.org/F4V/H263_NM_f.mp4.
>>>>
>>>> Signed-off-by: Moritz Barsnick <barsnick@gmx.net>
>>>> ---
>>>>   libavformat/mov.c | 4 ++--
>>>>   1 file changed, 2 insertions(+), 2 deletions(-)
>>>>
>>>> diff --git a/libavformat/mov.c b/libavformat/mov.c
>>>> index adc52de947..40fff5dd7d 100644
>>>> --- a/libavformat/mov.c
>>>> +++ b/libavformat/mov.c
>>>> @@ -894,7 +894,7 @@ static int mov_read_ddts(MOVContext *c, 
>>>> AVIOContext *pb, MOVAtom atom)
>>>>               (frame_duration_code == 3) ? 4096 : 0;
>>>>
>>>>       if (channel_layout_code > 0xff) {
>>>> -        av_log(c->fc, AV_LOG_WARNING, "Unsupported DTS audio 
>>>> channel layout");
>>>> +        av_log(c->fc, AV_LOG_WARNING, "Unsupported DTS audio 
>>>> channel layout\n");
>>>>       }
>>>>       st->codecpar->channel_layout =
>>>>               ((channel_layout_code & 0x1) ? AV_CH_FRONT_CENTER : 0) |
>>>> @@ -5219,7 +5219,7 @@ static int mov_read_elst(MOVContext *c, 
>>>> AVIOContext *pb, MOVAtom atom)
>>>>           } else {
>>>>               edit_count = atom.size / elst_entry_size;
>>>>               if (edit_count * elst_entry_size != atom.size) {
>>>> -                av_log(c->fc, AV_LOG_WARNING, "ELST atom of 
>>>> %"PRId64" bytes, bigger than %d entries.", atom.size, edit_count);
>>>> +                av_log(c->fc, AV_LOG_WARNING, "ELST atom of 
>>>> %"PRId64" bytes, bigger than %d entries.\n", atom.size, edit_count);
>>>>               }
>>>>           }
>>>>       }
>>> LGTM
>> Ping for push.
>
> Within a day.

Pushed as 2dabee7c0faef202ed04e20856e9f58cb4415810

Gyan
diff mbox series

Patch

diff --git a/libavformat/mov.c b/libavformat/mov.c
index adc52de947..40fff5dd7d 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -894,7 +894,7 @@  static int mov_read_ddts(MOVContext *c, AVIOContext *pb, MOVAtom atom)
             (frame_duration_code == 3) ? 4096 : 0;

     if (channel_layout_code > 0xff) {
-        av_log(c->fc, AV_LOG_WARNING, "Unsupported DTS audio channel layout");
+        av_log(c->fc, AV_LOG_WARNING, "Unsupported DTS audio channel layout\n");
     }
     st->codecpar->channel_layout =
             ((channel_layout_code & 0x1) ? AV_CH_FRONT_CENTER : 0) |
@@ -5219,7 +5219,7 @@  static int mov_read_elst(MOVContext *c, AVIOContext *pb, MOVAtom atom)
         } else {
             edit_count = atom.size / elst_entry_size;
             if (edit_count * elst_entry_size != atom.size) {
-                av_log(c->fc, AV_LOG_WARNING, "ELST atom of %"PRId64" bytes, bigger than %d entries.", atom.size, edit_count);
+                av_log(c->fc, AV_LOG_WARNING, "ELST atom of %"PRId64" bytes, bigger than %d entries.\n", atom.size, edit_count);
             }
         }
     }