diff options
| author | Wu, Ke <wuke@cs.umd.edu> | 2014-12-17 16:11:38 -0500 |
|---|---|---|
| committer | Wu, Ke <wuke@cs.umd.edu> | 2014-12-17 16:11:38 -0500 |
| commit | 7468e8d85e99b4619442c7afaf4a0d92870111bb (patch) | |
| tree | a6f17da7c69048c8900260b5490bb9d8611be3bb /decoder/ff_context.h | |
| parent | b6dd5a683db9dda2d634dd2fdb76606819594901 (diff) | |
| parent | 1a79175f9a101d46cf27ca921213d5dd9300518f (diff) | |
Merge with upstream
Diffstat (limited to 'decoder/ff_context.h')
| -rw-r--r-- | decoder/ff_context.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/decoder/ff_context.h b/decoder/ff_context.h index 19198ec3..ed1aea2b 100644 --- a/decoder/ff_context.h +++ b/decoder/ff_context.h @@ -1,6 +1,5 @@ - -#ifndef _FF_CONTEXT_H_ -#define _FF_CONTEXT_H_ +#ifndef FF_CONTEXT_H_ +#define FF_CONTEXT_H_ #include <vector> #include <boost/xpressive/xpressive.hpp> |