Commit 980f0d45 authored by vaclav's avatar vaclav Committed by Manuel Jander
Browse files

clang-format

parent 2e20403c

apps/decoder.c

+5 −1
Original line number Diff line number Diff line
@@ -1879,6 +1879,7 @@ static ivas_error initOnFirstGoodFrame( 
                }

            }

<<<<<<< HEAD

<<<<<<< HEAD

<<<<<<< HEAD



            if ( !isSplitCoded )
@@ -1887,6 +1888,9 @@ static ivas_error initOnFirstGoodFrame( 
>>>>>>> 554f97d05 (accept FIX_1119_SPLIT_RENDERING_VOIP)

=======

            

=======



>>>>>>> 6115666d3 (clang-format)

            if ( !isSplitCoded )

>>>>>>> 245a6d7b0 (fix)

            {