diff options
| author | Kostya Shishkov <kostya.shishkov@gmail.com> | 2007-05-06 11:01:25 +0000 |
|---|---|---|
| committer | Kostya Shishkov <kostya.shishkov@gmail.com> | 2007-05-06 11:01:25 +0000 |
| commit | de53b04b53f90d94bad16a3358cdc8b5b41ebee3 (patch) | |
| tree | d7b634ad5c9a75a4dc85e880871c00fa47ac9314 /libavcodec | |
| parent | 22c3029da1a742cd449347008db8dc9340805c91 (diff) | |
| download | ffmpeg-de53b04b53f90d94bad16a3358cdc8b5b41ebee3.tar.gz | |
Make vc1_parser.c compilable without special defines
Originally committed as revision 8914 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/vc1.h | 5 | ||||
| -rw-r--r-- | libavcodec/vc1_parser.c | 1 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/vc1.h b/libavcodec/vc1.h index ab2b231cce..04568ca492 100644 --- a/libavcodec/vc1.h +++ b/libavcodec/vc1.h @@ -20,6 +20,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "avcodec.h" +#include "mpegvideo.h" + /** Markers used in VC-1 AP frame data */ //@{ enum VC1Code{ @@ -35,7 +38,6 @@ enum VC1Code{ #define IS_MARKER(x) (((x) & ~0xFF) == VC1_CODE_RES0) -#ifndef VC1_PARSER_ONLY /** Available Profiles */ //@{ enum Profile { @@ -298,4 +300,3 @@ typedef struct VC1Context{ int p_frame_skipped; int bi_type; } VC1Context; -#endif diff --git a/libavcodec/vc1_parser.c b/libavcodec/vc1_parser.c index 4fa9e52a0b..a4db401fc2 100644 --- a/libavcodec/vc1_parser.c +++ b/libavcodec/vc1_parser.c @@ -26,7 +26,6 @@ */ #include "parser.h" -#define VC1_PARSER_ONLY #include "vc1.h" /** |