move definition of MB_TYPE_H261_FIL to h261.h so h261.c doesn't
need to #include "h261data.h" Originally committed as revision 9339 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
		
							parent
							
								
									859cfdc0e6
								
							
						
					
					
						commit
						b3e83c965d
					
				@ -28,7 +28,6 @@
 | 
			
		||||
#include "dsputil.h"
 | 
			
		||||
#include "avcodec.h"
 | 
			
		||||
#include "h261.h"
 | 
			
		||||
#include "h261data.h"
 | 
			
		||||
 | 
			
		||||
#define IS_FIL(a)    ((a)&MB_TYPE_H261_FIL)
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -43,3 +43,4 @@ typedef struct H261Context{
 | 
			
		||||
    int gob_start_code_skipped; // 1 if gob start code is already read before gob header is read
 | 
			
		||||
}H261Context;
 | 
			
		||||
 | 
			
		||||
#define MB_TYPE_H261_FIL 0x800000
 | 
			
		||||
 | 
			
		||||
@ -23,7 +23,6 @@
 | 
			
		||||
 * @file h261data.h
 | 
			
		||||
 * H.261 tables.
 | 
			
		||||
 */
 | 
			
		||||
#define MB_TYPE_H261_FIL 0x800000
 | 
			
		||||
 | 
			
		||||
// H.261 VLC table for macroblock addressing
 | 
			
		||||
static const uint8_t h261_mba_code[35] = {
 | 
			
		||||
 | 
			
		||||
@ -28,8 +28,8 @@
 | 
			
		||||
#include "dsputil.h"
 | 
			
		||||
#include "avcodec.h"
 | 
			
		||||
#include "mpegvideo.h"
 | 
			
		||||
#include "h261data.h"
 | 
			
		||||
#include "h261.h"
 | 
			
		||||
#include "h261data.h"
 | 
			
		||||
 | 
			
		||||
#define H261_MBA_VLC_BITS 9
 | 
			
		||||
#define H261_MTYPE_VLC_BITS 6
 | 
			
		||||
 | 
			
		||||
@ -28,8 +28,8 @@
 | 
			
		||||
#include "dsputil.h"
 | 
			
		||||
#include "avcodec.h"
 | 
			
		||||
#include "mpegvideo.h"
 | 
			
		||||
#include "h261data.h"
 | 
			
		||||
#include "h261.h"
 | 
			
		||||
#include "h261data.h"
 | 
			
		||||
 | 
			
		||||
extern uint8_t ff_h261_rl_table_store[2][2*MAX_RUN + MAX_LEVEL + 3];
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user