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 /libavformat/options_table.h | |
| parent | 95015634f5017897a61f4883bc217b0f7efbc40c (diff) | |
| parent | c35f0e8495e34c2082dcde805e9323c9f6a4cb0a (diff) | |
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 'libavformat/options_table.h')
| -rw-r--r-- | libavformat/options_table.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/options_table.h b/libavformat/options_table.h index 300334f39b..dbe37d7072 100644 --- a/libavformat/options_table.h +++ b/libavformat/options_table.h @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef AVFORMAT_OPTIONS_TABLE -#define AVFORMAT_OPTIONS_TABLE +#ifndef AVFORMAT_OPTIONS_TABLE_H +#define AVFORMAT_OPTIONS_TABLE_H #include <limits.h> @@ -82,4 +82,4 @@ static const AVOption options[]={ #undef DEFAULT #undef OFFSET -#endif // AVFORMAT_OPTIONS_TABLE +#endif /* AVFORMAT_OPTIONS_TABLE_H */ |