summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-06-16 12:09:15 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-06-16 12:09:20 +0200
commit593dc5aed907594753862828a461f58b5d48a0e0 (patch)
treed35775606558d3baabc747a0ba3bb88926decef3
parentb152152df3b778d0a86dcda5d4f5d065b4175a7b (diff)
parent5a69ded12aaf2bd3baed5d1d644ef23cfecef87f (diff)
downloadffmpeg-streaming-593dc5aed907594753862828a461f58b5d48a0e0.zip
ffmpeg-streaming-593dc5aed907594753862828a461f58b5d48a0e0.tar.gz
Merge commit '5a69ded12aaf2bd3baed5d1d644ef23cfecef87f'
* commit '5a69ded12aaf2bd3baed5d1d644ef23cfecef87f': vf_showinfo: print display transformation values Merged-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavfilter/vf_showinfo.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/libavfilter/vf_showinfo.c b/libavfilter/vf_showinfo.c
index ec4bed1..323cf77 100644
--- 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);
OpenPOWER on IntegriCloud