diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-18 14:27:59 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-18 14:27:59 +0100 |
| commit | 94ecbe23c52b699a8f2bda1cf71fb4efbf28679a (patch) | |
| tree | 240b05c733a4d256ffbffa74f80fa3dcea49fc81 /libavcodec/gsmdec_data.h | |
| parent | 95015634f5017897a61f4883bc217b0f7efbc40c (diff) | |
| parent | c35f0e8495e34c2082dcde805e9323c9f6a4cb0a (diff) | |
| download | ffmpeg-94ecbe23c52b699a8f2bda1cf71fb4efbf28679a.tar.gz | |
Merge commit 'c35f0e8495e34c2082dcde805e9323c9f6a4cb0a'
* commit 'c35f0e8495e34c2082dcde805e9323c9f6a4cb0a':
au: Reorder code so that both muxer and demuxer are under #ifdefs
fate: Move RALF test into lossless audio group
cosmetics: Use consistent names for multiple inclusion guards.
Conflicts:
libavformat/au.c
tests/fate/lossless-audio.mak
tests/fate/real.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/gsmdec_data.h')
| -rw-r--r-- | libavcodec/gsmdec_data.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/gsmdec_data.h b/libavcodec/gsmdec_data.h index 6abe2b47b3..082c65d4b1 100644 --- a/libavcodec/gsmdec_data.h +++ b/libavcodec/gsmdec_data.h @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef AVCODEC_GSMDEC_DATA -#define AVCODEC_GSMDEC_DATA +#ifndef AVCODEC_GSMDEC_DATA_H +#define AVCODEC_GSMDEC_DATA_H #include <stdint.h> #include "avcodec.h" @@ -41,4 +41,4 @@ typedef struct GSMContext { extern const uint16_t ff_gsm_long_term_gain_tab[4]; extern const int16_t ff_gsm_dequant_tab[64][8]; -#endif /* AVCODEC_GSMDEC_DATA */ +#endif /* AVCODEC_GSMDEC_DATA_H */ |