Merge commit '5a69ded12aaf2bd3baed5d1d644ef23cfecef87f'

* commit '5a69ded12aaf2bd3baed5d1d644ef23cfecef87f':
  vf_showinfo: print display transformation values

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --git a/libavfilter/vf_showinfo.c b/libavfilter/vf_showinfo.c
index ec4bed144119ff7c538cadf476c4dcc1d9ebcc2d..323cf776204ae9e7188c6241962872c3d4e67abc 100644 (file)
--- a/libavfilter/vf_showinfo.c
+++ b/libavfilter/vf_showinfo.c
@@ -25,6 +25,7 @@
 #include <inttypes.h>
 
 #include "libavutil/adler32.h"
+#include "libavutil/display.h"
 #include "libavutil/imgutils.h"
 #include "libavutil/internal.h"
 #include "libavutil/pixdesc.h"
@@ -142,6 +143,10 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame)
         case AV_FRAME_DATA_STEREO3D:
             dump_stereo3d(ctx, sd);
             break;
+        case AV_FRAME_DATA_DISPLAYMATRIX:
+            av_log(ctx, AV_LOG_INFO, "displaymatrix: rotation of %.2f degrees",
+                   av_display_rotation_get((int32_t *)sd->data));
+            break;
         default:
             av_log(ctx, AV_LOG_WARNING, "unknown side data type %d (%d bytes)",
                    sd->type, sd->size);