Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
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
  • Loading branch information
mansr authored and mstorsjo committed Jan 12, 2012
1 parent 0a3fcc3 commit 62a62ef
Show file tree
Hide file tree
Showing 133 changed files with 5,071 additions and 5,071 deletions.
2 changes: 1 addition & 1 deletion media/libstagefright/codecs/aacenc/Android.mk
Expand Up @@ -59,7 +59,7 @@ LOCAL_MODULE := libstagefright_aacenc

LOCAL_ARM_MODE := arm

LOCAL_STATIC_LIBRARIES :=
LOCAL_STATIC_LIBRARIES :=

LOCAL_SHARED_LIBRARIES :=

Expand Down
8 changes: 4 additions & 4 deletions media/libstagefright/codecs/aacenc/SampleCode/AAC_E_SAMPLES.c
Expand Up @@ -29,11 +29,11 @@
#include "cmnMemory.h"

#define VO_AAC_E_OUTPUT 1
#define READ_SIZE (1024*8)
#define READ_SIZE (1024*8)
unsigned char outBuf[1024*8];
unsigned char inBuf[READ_SIZE];

const char* HelpString =
const char* HelpString =
"VisualOn AAC encoder Usage:\n"
"voAACEncTest -if <inputfile.pcm> -of <outputfile.aac> -sr <samplerate> -ch <channel> -br <bitrate> -adts <adts> \n"
"-if input file name \n"
Expand All @@ -49,7 +49,7 @@ static int parsecmdline(int argc, char **argv,char **input_filename, char **ou
{
// notice that:
// bitRate/nChannels > 8000
// bitRate/nChannels < 160000
// bitRate/nChannels < 160000
// bitRate/nChannels < sampleRate*6
param->adtsUsed = 1;
param->bitRate = 0;
Expand All @@ -69,7 +69,7 @@ static int parsecmdline(int argc, char **argv,char **input_filename, char **ou
{
argv++;
argc--;
*input_filename = *argv;
*input_filename = *argv;
}
else if (!strcmp(*argv, "-of"))
{
Expand Down

0 comments on commit 62a62ef

Please sign in to comment.