Browse Source
Make vc1_parser.c compilable without special defines
Originally committed as revision 8914 to svn://svn.ffmpeg.org/ffmpeg/trunktags/v0.5
Kostya Shishkov
18 years ago
2 changed files with 3 additions and 3 deletions
Unified View
Diff Options
-
+3 -2libavcodec/vc1.h
-
+0 -1libavcodec/vc1_parser.c
+ 3
- 2
libavcodec/vc1.h
View File
| @@ -20,6 +20,9 @@ | |||||
| * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | * 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 */ | /** Markers used in VC-1 AP frame data */ | ||||
| //@{ | //@{ | ||||
| enum VC1Code{ | enum VC1Code{ | ||||
| @@ -35,7 +38,6 @@ enum VC1Code{ | |||||
| #define IS_MARKER(x) (((x) & ~0xFF) == VC1_CODE_RES0) | #define IS_MARKER(x) (((x) & ~0xFF) == VC1_CODE_RES0) | ||||
| #ifndef VC1_PARSER_ONLY | |||||
| /** Available Profiles */ | /** Available Profiles */ | ||||
| //@{ | //@{ | ||||
| enum Profile { | enum Profile { | ||||
| @@ -298,4 +300,3 @@ typedef struct VC1Context{ | |||||
| int p_frame_skipped; | int p_frame_skipped; | ||||
| int bi_type; | int bi_type; | ||||
| } VC1Context; | } VC1Context; | ||||
| #endif | |||||
+ 0
- 1
libavcodec/vc1_parser.c
View File
| @@ -26,7 +26,6 @@ | |||||
| */ | */ | ||||
| #include "parser.h" | #include "parser.h" | ||||
| #define VC1_PARSER_ONLY | |||||
| #include "vc1.h" | #include "vc1.h" | ||||
| /** | /** | ||||