Conflicts:
	libarmbox/video.cpp


Origin commit data
------------------
Branch: master
Commit: d61822e251
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-03-25 (Sun, 25 Mar 2018)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2018-03-25 22:50:38 +02:00

View File

@@ -363,7 +363,7 @@ int cVideo::setAspectRatio(int aspect, int mode)
{
static const char *a[] = { "n/a", "4:3", "14:9", "16:9" };
// static const char *m[] = { "panscan", "letterbox", "bestfit", "nonlinear", "(unset)" };
static const char *m[] = { "letterbox", "panscan", "bestfit", "nonlinear", "(unset)" };
static const char *m[] = { "letterbox", "panscan", "bestfit", "nonlinear", "(unset)" };
int n;
lt_debug("%s: a:%d m:%d %s\n", __func__, aspect, mode, m[(mode < 0||mode > 3) ? 4 : mode]);