Michael Niedermayer
							
						 
					 | 
					
						
						
							
						
						77aafadc56
					 | 
					
						
						
							
							Merge commit 'db7f1c7c5a1d37e7f4da64a79a97bea1c4b6e9f8'
						
						
						
						
						
						
						
						* commit 'db7f1c7c5a1d37e7f4da64a79a97bea1c4b6e9f8':
  h264: Move start code search functions into separate source files.
Conflicts:
	libavcodec/arm/Makefile
	libavcodec/arm/h264dsp_init_arm.c
	libavcodec/h264_parser.c
	libavcodec/h264dsp.c
	libavcodec/startcode.c
	libavcodec/startcode.h
See: 270cede3f3
Merged-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 | 
					
						2014-08-05 12:46:10 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |