Commit 4ddc0d05 authored by Lauros Pajunen's avatar Lauros Pajunen
Browse files

Fix merge conflicts

parent 58269438

lib_rend/ivas_rotation.c

+0 −1
Original line number Diff line number Diff line
@@ -372,7 +372,6 @@ void rotateFrame_sd( 
#else

    HEAD_TRACK_DATA_HANDLE hHeadTrackData, /* i  : head track handle                */

#endif

    HEAD_TRACK_DATA_HANDLE hHeadTrackData, /* i  : head track handle                */

    float *output[],                       /* i/o: unrotated SD signal buffer in TD */

    const int16_t subframe_len,            /* i  : subframe length per channel      */

    const IVAS_OUTPUT_SETUP hTransSetup,   /* i  : format for rotation              */