Author: superdump Revision: 3128 Property Name: svn:log Action: modified Property diff: --- old property value +++ new property value @@ -1 +1 @@ -Merge convert_to_int16() into acc_decode_frame() +Merge convert_to_int16() into aac_decode_frame()