Re: [FFmpeg-devel] [PATCH] ffprobe: move abort() call to after the print statements

[Ganesh Ajjanagadde]

On Wed, Oct 28, 2015 at 5:14 AM, Michael Niedermayer
 wrote:
> On Wed, Oct 28, 2015 at 09:55:56AM +0100, wm4 wrote:
>> On Tue, 27 Oct 2015 20:21:11 -0400
>> Ganesh Ajjanagadde  wrote:
>>
>> > This fixes warning C4702 "unreachable code" reported in MSVC:
>> > http://fate.ffmpeg.org/log.cgi?time=20151026165907=compile=x86_64-msvc12-windows-native,
>> > and also likely fixes the intended behavior.
>> >
>> > Signed-off-by: Ganesh Ajjanagadde 
>> > ---
>> >  ffprobe.c | 2 +-
>> >  1 file changed, 1 insertion(+), 1 deletion(-)
>> >
>> > diff --git a/ffprobe.c b/ffprobe.c
>> > index 02e2c48..0374cd9 100644
>> > --- a/ffprobe.c
>> > +++ b/ffprobe.c
>> > @@ -1890,9 +1890,9 @@ static void show_frame(WriterContext *w, AVFrame 
>> > *frame, AVStream *stream,
>> >  print_str("side_data_type", name ? name : "unknown");
>> >  print_int("side_data_size", sd->size);
>> >  if (sd->type == AV_FRAME_DATA_DISPLAYMATRIX && sd->size >= 
>> > 9*4) {
>> > -abort();
>> >  writer_print_integers(w, "displaymatrix", sd->data, 9, " 
>> > %11d", 3, 4, 1);
>> >  print_int("rotation", av_display_rotation_get((int32_t 
>> > *)sd->data));
>> > +abort();
>> >  }
>> >  writer_print_section_footer(w);
>> >  }
>>
>> Why the heck is there an abort()?
>
> It looks like mistake (used for testing/debuging), ill remove it
>
> Thanks

goes without saying, but patch dropped since abort has been removed.

>
> [...]
> --
> 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
> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

Re: [FFmpeg-devel] [PATCH] ffprobe: move abort() call to after the print statements

[wm4]

On Tue, 27 Oct 2015 20:21:11 -0400
Ganesh Ajjanagadde  wrote:

> This fixes warning C4702 "unreachable code" reported in MSVC:
> http://fate.ffmpeg.org/log.cgi?time=20151026165907=compile=x86_64-msvc12-windows-native,
> and also likely fixes the intended behavior.
> 
> Signed-off-by: Ganesh Ajjanagadde 
> ---
>  ffprobe.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/ffprobe.c b/ffprobe.c
> index 02e2c48..0374cd9 100644
> --- a/ffprobe.c
> +++ b/ffprobe.c
> @@ -1890,9 +1890,9 @@ static void show_frame(WriterContext *w, AVFrame 
> *frame, AVStream *stream,
>  print_str("side_data_type", name ? name : "unknown");
>  print_int("side_data_size", sd->size);
>  if (sd->type == AV_FRAME_DATA_DISPLAYMATRIX && sd->size >= 9*4) {
> -abort();
>  writer_print_integers(w, "displaymatrix", sd->data, 9, " 
> %11d", 3, 4, 1);
>  print_int("rotation", av_display_rotation_get((int32_t 
> *)sd->data));
> +abort();
>  }
>  writer_print_section_footer(w);
>  }

Why the heck is there an abort()?
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

Re: [FFmpeg-devel] [PATCH] ffprobe: move abort() call to after the print statements

[Michael Niedermayer]

On Wed, Oct 28, 2015 at 09:55:56AM +0100, wm4 wrote:
> On Tue, 27 Oct 2015 20:21:11 -0400
> Ganesh Ajjanagadde  wrote:
> 
> > This fixes warning C4702 "unreachable code" reported in MSVC:
> > http://fate.ffmpeg.org/log.cgi?time=20151026165907=compile=x86_64-msvc12-windows-native,
> > and also likely fixes the intended behavior.
> > 
> > Signed-off-by: Ganesh Ajjanagadde 
> > ---
> >  ffprobe.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/ffprobe.c b/ffprobe.c
> > index 02e2c48..0374cd9 100644
> > --- a/ffprobe.c
> > +++ b/ffprobe.c
> > @@ -1890,9 +1890,9 @@ static void show_frame(WriterContext *w, AVFrame 
> > *frame, AVStream *stream,
> >  print_str("side_data_type", name ? name : "unknown");
> >  print_int("side_data_size", sd->size);
> >  if (sd->type == AV_FRAME_DATA_DISPLAYMATRIX && sd->size >= 
> > 9*4) {
> > -abort();
> >  writer_print_integers(w, "displaymatrix", sd->data, 9, " 
> > %11d", 3, 4, 1);
> >  print_int("rotation", av_display_rotation_get((int32_t 
> > *)sd->data));
> > +abort();
> >  }
> >  writer_print_section_footer(w);
> >  }
> 
> Why the heck is there an abort()?

It looks like mistake (used for testing/debuging), ill remove it

Thanks

[...]
-- 
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


signature.asc
Description: Digital signature
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

[FFmpeg-devel] [PATCH] ffprobe: move abort() call to after the print statements

[Ganesh Ajjanagadde]

This fixes warning C4702 "unreachable code" reported in MSVC:
http://fate.ffmpeg.org/log.cgi?time=20151026165907=compile=x86_64-msvc12-windows-native,
and also likely fixes the intended behavior.

Signed-off-by: Ganesh Ajjanagadde 
---
 ffprobe.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ffprobe.c b/ffprobe.c
index 02e2c48..0374cd9 100644
--- a/ffprobe.c
+++ b/ffprobe.c
@@ -1890,9 +1890,9 @@ static void show_frame(WriterContext *w, AVFrame *frame, 
AVStream *stream,
 print_str("side_data_type", name ? name : "unknown");
 print_int("side_data_size", sd->size);
 if (sd->type == AV_FRAME_DATA_DISPLAYMATRIX && sd->size >= 9*4) {
-abort();
 writer_print_integers(w, "displaymatrix", sd->data, 9, " 
%11d", 3, 4, 1);
 print_int("rotation", av_display_rotation_get((int32_t 
*)sd->data));
+abort();
 }
 writer_print_section_footer(w);
 }
-- 
2.6.2

___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel