Skip to content

Commit 62a62ef

Browse files
mansrmstorsjo
authored andcommitted
stagefright aacenc/amrwbenc: Remove trailing whitespace
This was applied in AOSP master earlier, in commit b21611e, but when merged into the Google internal tree in 88c2d4d, none of these changes have been brought in. (The diff of this merge commit and its first parent, d94b71d, is empty.) Therefore, reapply the rest of these changes on the files that still are present in the current version. Change-Id: I645a9b9134769958a11808a06163123d28d83e46
1 parent 0a3fcc3 commit 62a62ef

File tree

133 files changed

+5071
-5071
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

133 files changed

+5071
-5071
lines changed

media/libstagefright/codecs/aacenc/Android.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ LOCAL_MODULE := libstagefright_aacenc
5959

6060
LOCAL_ARM_MODE := arm
6161

62-
LOCAL_STATIC_LIBRARIES :=
62+
LOCAL_STATIC_LIBRARIES :=
6363

6464
LOCAL_SHARED_LIBRARIES :=
6565

media/libstagefright/codecs/aacenc/SampleCode/AAC_E_SAMPLES.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@
2929
#include "cmnMemory.h"
3030

3131
#define VO_AAC_E_OUTPUT 1
32-
#define READ_SIZE (1024*8)
32+
#define READ_SIZE (1024*8)
3333
unsigned char outBuf[1024*8];
3434
unsigned char inBuf[READ_SIZE];
3535

36-
const char* HelpString =
36+
const char* HelpString =
3737
"VisualOn AAC encoder Usage:\n"
3838
"voAACEncTest -if <inputfile.pcm> -of <outputfile.aac> -sr <samplerate> -ch <channel> -br <bitrate> -adts <adts> \n"
3939
"-if input file name \n"
@@ -49,7 +49,7 @@ static int parsecmdline(int argc, char **argv,char **input_filename, char **ou
4949
{
5050
// notice that:
5151
// bitRate/nChannels > 8000
52-
// bitRate/nChannels < 160000
52+
// bitRate/nChannels < 160000
5353
// bitRate/nChannels < sampleRate*6
5454
param->adtsUsed = 1;
5555
param->bitRate = 0;
@@ -69,7 +69,7 @@ static int parsecmdline(int argc, char **argv,char **input_filename, char **ou
6969
{
7070
argv++;
7171
argc--;
72-
*input_filename = *argv;
72+
*input_filename = *argv;
7373
}
7474
else if (!strcmp(*argv, "-of"))
7575
{

0 commit comments

Comments
 (0)