Make vc1_parser.c compilable without special defines
Originally committed as revision 8914 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
		
							parent
							
								
									22c3029da1
								
							
						
					
					
						commit
						de53b04b53
					
				@ -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
 | 
			
		||||
 | 
			
		||||
@ -26,7 +26,6 @@
 | 
			
		||||
 */
 | 
			
		||||
 | 
			
		||||
#include "parser.h"
 | 
			
		||||
#define VC1_PARSER_ONLY
 | 
			
		||||
#include "vc1.h"
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user