diff options
author | James Dong <jdong@google.com> | 2011-05-25 12:37:07 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-05-25 12:37:07 -0700 |
commit | ade8c2d682d4f8c9424dece53e39400c237d22bf (patch) | |
tree | 0a167e54e73593e0420f6aa89214c1c8978784a6 /media/libstagefright/codecs/aacenc/inc/bit_cnt.h | |
parent | fa855e0e46fc706a2120bc4659aaeaf2ef395a4d (diff) | |
parent | e2e838afcf03e603a41a0455846eaf9614537c16 (diff) | |
download | frameworks_av-ade8c2d682d4f8c9424dece53e39400c237d22bf.zip frameworks_av-ade8c2d682d4f8c9424dece53e39400c237d22bf.tar.gz frameworks_av-ade8c2d682d4f8c9424dece53e39400c237d22bf.tar.bz2 |
Merge "Convert line breaks to Unix style"
Diffstat (limited to 'media/libstagefright/codecs/aacenc/inc/bit_cnt.h')
-rw-r--r-- | media/libstagefright/codecs/aacenc/inc/bit_cnt.h | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/media/libstagefright/codecs/aacenc/inc/bit_cnt.h b/media/libstagefright/codecs/aacenc/inc/bit_cnt.h index 808319e..266a219 100644 --- a/media/libstagefright/codecs/aacenc/inc/bit_cnt.h +++ b/media/libstagefright/codecs/aacenc/inc/bit_cnt.h @@ -1,29 +1,29 @@ -/*
- ** Copyright 2003-2010, VisualOn, Inc.
- **
- ** 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.
- */
-/*******************************************************************************
- File: bit_cnt.h
-
- Content: Huffman Bitcounter & coder structure and functions
-
+/* + ** Copyright 2003-2010, VisualOn, Inc. + ** + ** 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. + */ +/******************************************************************************* + File: bit_cnt.h + + Content: Huffman Bitcounter & coder structure and functions + *******************************************************************************/ #ifndef __BITCOUNT_H #define __BITCOUNT_H -#include "bitbuffer.h"
+#include "bitbuffer.h" #include "basic_op.h" #define INVALID_BITCOUNT (MAX_16/4) |