Commit 590810e1 authored by emerit's avatar emerit
Browse files

Fix merge issue

parent 896d277b

apps/renderer.c

+4 −0
Original line number Diff line number Diff line
@@ -1237,7 +1237,11 @@ static bool parseDiegeticPan( 
            return false;

        }

    }

#ifdef NO_DIEGETIC_PAN

    return true;

#else

    return false;

#endif

}



static bool parseOrientationTracking(