[FFmpeg-cvslog] ffprobe: Remove abort()

Michael Niedermayer git at videolan.org
Wed Oct 28 10:22:40 CET 2015


ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Wed Oct 28 10:11:22 2015 +0100| [057ce755b9370629bcc840c998d5344099e46183] | committer: Michael Niedermayer

ffprobe: Remove abort()

Found-by: Ganesh Ajjanagadde and wm4
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=057ce755b9370629bcc840c998d5344099e46183
---

 ffprobe.c |    1 -
 1 file changed, 1 deletion(-)

diff --git a/ffprobe.c b/ffprobe.c
index 02e2c48..92c7fa6 100644
--- a/ffprobe.c
+++ b/ffprobe.c
@@ -1890,7 +1890,6 @@ 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));
             }



More information about the ffmpeg-cvslog mailing list