aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2017-10-23 18:49:22 -0300
committerJames Almer <jamrial@gmail.com>2017-10-23 18:49:22 -0300
commit69bb3f7bffa20b843efb1b52514bb8e65362936c (patch)
tree6d553955b55d98455d155e1bde9e86a7c366e114
parent2f4677a11fd9de98851886841e55c89a655f2605 (diff)
parent3f128fc4a3fa1ef8a87974eb5484a997a84868fe (diff)
downloadffmpeg-69bb3f7bffa20b843efb1b52514bb8e65362936c.tar.gz
Merge commit '3f128fc4a3fa1ef8a87974eb5484a997a84868fe'
* commit '3f128fc4a3fa1ef8a87974eb5484a997a84868fe': vf_showinfo: Simplify reporting stereo3d information Merged-by: James Almer <jamrial@gmail.com>
-rw-r--r--libavfilter/vf_showinfo.c14
1 files changed, 1 insertions, 13 deletions
diff --git a/libavfilter/vf_showinfo.c b/libavfilter/vf_showinfo.c
index 14b8aa4aff..834e742fcb 100644
--- a/libavfilter/vf_showinfo.c
+++ b/libavfilter/vf_showinfo.c
@@ -48,19 +48,7 @@ static void dump_stereo3d(AVFilterContext *ctx, AVFrameSideData *sd)
stereo = (AVStereo3D *)sd->data;
- av_log(ctx, AV_LOG_INFO, "type - ");
- switch (stereo->type) {
- case AV_STEREO3D_2D: av_log(ctx, AV_LOG_INFO, "2D"); break;
- case AV_STEREO3D_SIDEBYSIDE: av_log(ctx, AV_LOG_INFO, "side by side"); break;
- case AV_STEREO3D_TOPBOTTOM: av_log(ctx, AV_LOG_INFO, "top and bottom"); break;
- case AV_STEREO3D_FRAMESEQUENCE: av_log(ctx, AV_LOG_INFO, "frame alternate"); break;
- case AV_STEREO3D_CHECKERBOARD: av_log(ctx, AV_LOG_INFO, "checkerboard"); break;
- case AV_STEREO3D_LINES: av_log(ctx, AV_LOG_INFO, "interleaved lines"); break;
- case AV_STEREO3D_COLUMNS: av_log(ctx, AV_LOG_INFO, "interleaved columns"); break;
- case AV_STEREO3D_SIDEBYSIDE_QUINCUNX: av_log(ctx, AV_LOG_INFO, "side by side "
- "(quincunx subsampling)"); break;
- default: av_log(ctx, AV_LOG_WARNING, "unknown"); break;
- }
+ av_log(ctx, AV_LOG_INFO, "type - %s", av_stereo3d_type_name(stereo->type));
if (stereo->flags & AV_STEREO3D_FLAG_INVERT)
av_log(ctx, AV_LOG_INFO, " (inverted)");