Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 496dd58c authored by Andreas Huber's avatar Andreas Huber Committed by Android Git Automerger
Browse files

am b95ea9ec: am 6ae24d93: Merge change I3c01bb62 into eclair-mr2 

Merge commit 'b95ea9ecb2a7b0028c02e096589397e00fdef67a'

* commit 'b95ea9ecb2a7b0028c02e096589397e00fdef67a':
  Adding copyright headers to recently introduced decoder source files.
parents caba7feb ec274593

media/libstagefright/codecs/aacdec/AACDecoder.cpp

+16 −0
Original line number Original line Diff line number Diff line 
/*

 * Copyright (C) 2009 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#include "AACDecoder.h"

#include "AACDecoder.h"





#include "../../include/ESDS.h"

#include "../../include/ESDS.h"

media/libstagefright/codecs/mp3dec/MP3Decoder.cpp

+16 −0
Original line number Original line Diff line number Diff line 
/*

 * Copyright (C) 2009 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#include "MP3Decoder.h"

#include "MP3Decoder.h"





#include "include/pvmp3decoder_api.h"

#include "include/pvmp3decoder_api.h"