|  | @ -7,6 +7,8 @@ FFMPEG_BRANCH ?= ni/ffmpeg/2.8 | 
			
		
	
		
		
			
				
					|  |  | #FFMPEG_BRANCH ?= ni/ffmpeg/master
 |  |  | #FFMPEG_BRANCH ?= ni/ffmpeg/master
 | 
			
		
	
		
		
			
				
					|  |  | #FFMPEG_BRANCH ?= ffmpeg/master
 |  |  | #FFMPEG_BRANCH ?= ffmpeg/master
 | 
			
		
	
		
		
			
				
					|  |  | 
 |  |  | 
 | 
			
		
	
		
		
			
				
					|  |  |  |  |  | FFMPEG_DEPENDENCIES = openssl rtmpdump libbluray libass | 
			
		
	
		
		
			
				
					|  |  |  |  |  | 
 | 
			
		
	
		
		
			
				
					|  |  | FFMPEG_CONF_OPTS = \
 |  |  | FFMPEG_CONF_OPTS = \
 | 
			
		
	
		
		
			
				
					|  |  | 	--prefix=$(prefix) \
 |  |  | 	--prefix=$(prefix) \
 | 
			
		
	
		
		
			
				
					|  |  | 	--cross-prefix=$(TARGET_CROSS) \
 |  |  | 	--cross-prefix=$(TARGET_CROSS) \
 | 
			
		
	
	
		
		
			
				
					|  | @ -138,8 +140,6 @@ FFMPEG_CONF_OPTS = \ | 
			
		
	
		
		
			
				
					|  |  | 	--arch=$(TARGET_ARCH) \
 |  |  | 	--arch=$(TARGET_ARCH) \
 | 
			
		
	
		
		
			
				
					|  |  | 	--extra-ldflags="$(TARGET_LDFLAGS)" |  |  | 	--extra-ldflags="$(TARGET_LDFLAGS)" | 
			
		
	
		
		
			
				
					|  |  | 
 |  |  | 
 | 
			
		
	
		
		
			
				
					|  |  | FFMPEG_DEPENDENCIES = openssl rtmpdump libbluray libass |  |  |  | 
			
		
	
		
		
			
				
					|  |  | 
 |  |  |  | 
			
		
	
		
		
			
				
					|  |  | ifeq ($(FFMPEG_BRANCH),ni/ffmpeg/2.8) |  |  | ifeq ($(FFMPEG_BRANCH),ni/ffmpeg/2.8) | 
			
		
	
		
		
			
				
					|  |  |   FFMPEG_DEPENDENCIES += libroxml |  |  |   FFMPEG_DEPENDENCIES += libroxml | 
			
		
	
		
		
			
				
					|  |  | else |  |  | else | 
			
		
	
	
		
		
			
				
					|  | 
 |