Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							6cb2085278 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'qatar/master'  
						
						... 
						
						
						
						* qatar/master: (27 commits)
  ppc: Add ff_ prefix to nonstatic symbols
  sh4: Add ff_ prefix to nonstatic symbols
  mpegvideo: Add ff_ prefix to nonstatic functions
  rtjpeg: Add ff_ prefix to nonstatic symbols
  rv: Add ff_ prefix to nonstatic symbols
  vp56: Add ff_ prefix to nonstatic symbols
  vorbis: Add ff_ prefix to nonstatic symbols
  msmpeg4: Add ff_ prefix to nonstatic symbols
  vc1: Add ff_ prefix to nonstatic symbols
  msmpeg4: Add ff_ prefixes to nonstatic symbols
  snow: Add ff_ prefix to nonstatic symbols
  mpeg12: Add ff_ prefix to nonstatic symbols
  mpeg4: Add ff_ prefixes to nonstatic symbols
  lagarith: Add ff_ prefix to lag_rac_init
  libavcodec: Add ff_ prefix to j_rev_dct*
  dsputil: Add ff_ prefix to inv_zigzag_direct16
  libavcodec: Prefix fdct_ifast, fdct_ifast248
  dsputil: Add ff_ prefix to the dsputil*_init* functions
  libavcodec: Add ff_ prefix to some nonstatic symbols
  vlc/rl: Add ff_ prefix to the nonstatic symbols
  ...
Conflicts:
	libavcodec/Makefile
	libavcodec/allcodecs.c
	libavcodec/dnxhddec.c
	libavcodec/ffv1.c
	libavcodec/h263.h
	libavcodec/h263dec.c
	libavcodec/h264.c
	libavcodec/mpegvideo.c
	libavcodec/mpegvideo_enc.c
	libavcodec/nuv.c
	libavcodec/ppc/dsputil_ppc.c
	libavcodec/proresdsp.c
	libavcodec/svq3.c
	libavcodec/version.h
	libavformat/dv.h
	libavformat/dvenc.c
	libavformat/matroskadec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2012-02-16 01:34:37 +01:00 
						 
				 
			
				
					
						
							
							
								Martin Storsjö 
							
						 
					 
					
						
						
						
						
							
						
						
							0ca1bdb37d 
							
						 
					 
					
						
						
							
							rtjpeg: Add ff_ prefix to nonstatic symbols  
						
						... 
						
						
						
						Signed-off-by: Martin Storsjö <martin@martin.st> 
						
						
					 
					
						2012-02-15 22:07:20 +02:00 
						 
				 
			
				
					
						
							
							
								Mans Rullgard 
							
						 
					 
					
						
						
						
						
							
						
						
							2912e87a6c 
							
						 
					 
					
						
						
							
							Replace FFmpeg with Libav in licence headers  
						
						... 
						
						
						
						Signed-off-by: Mans Rullgard <mans@mansr.com> 
						
						
					 
					
						2011-03-19 13:33:20 +00:00 
						 
				 
			
				
					
						
							
							
								Måns Rullgård 
							
						 
					 
					
						
						
						
						
							
						
						
							84dc2d8afa 
							
						 
					 
					
						
						
							
							Remove DECLARE_ALIGNED_{8,16} macros  
						
						... 
						
						
						
						These macros are redundant.  All uses are replaced with the generic
DECLARE_ALIGNED macro instead.
Originally committed as revision 22233 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2010-03-06 14:24:59 +00:00 
						 
				 
			
				
					
						
							
							
								Måns Rullgård 
							
						 
					 
					
						
						
						
						
							
						
						
							c67278098d 
							
						 
					 
					
						
						
							
							Move array specifiers outside DECLARE_ALIGNED() invocations  
						
						... 
						
						
						
						Originally committed as revision 21377 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2010-01-22 03:25:11 +00:00 
						 
				 
			
				
					
						
							
							
								Reimar Döffinger 
							
						 
					 
					
						
						
						
						
							
						
						
							0766291a66 
							
						 
					 
					
						
						
							
							Move "block" variable in rtjpeg decoder to context to ensure sufficient alignment  
						
						... 
						
						
						
						for idct_put on architectures/compilers that have problems aligning on the stack.
Originally committed as revision 18924 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2009-05-24 08:36:52 +00:00 
						 
				 
			
				
					
						
							
							
								Stefano Sabatini 
							
						 
					 
					
						
						
						
						
							
						
						
							987903826b 
							
						 
					 
					
						
						
							
							Globally rename the header inclusion guard names.  
						
						... 
						
						
						
						Consistently apply this rule: the guard name is obtained from the
filename by stripping the leading "lib", converting '/' and '.'  to
'_' and uppercasing the resulting name. Guard names in the root
directory have to be prefixed by "FFMPEG_".
Originally committed as revision 15120 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2008-08-31 07:39:47 +00:00 
						 
				 
			
				
					
						
							
							
								Aurelien Jacobs 
							
						 
					 
					
						
						
						
						
							
						
						
							ce7f71a2dd 
							
						 
					 
					
						
						
							
							dsputil.h is a local header  
						
						... 
						
						
						
						Originally committed as revision 12308 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2008-03-03 23:14:25 +00:00 
						 
				 
			
				
					
						
							
							
								Reimar Döffinger 
							
						 
					 
					
						
						
						
						
							
						
						
							b034f72b17 
							
						 
					 
					
						
						
							
							Add some const keywords in rtjpeg decoder  
						
						... 
						
						
						
						Originally committed as revision 11792 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2008-02-01 16:20:27 +00:00 
						 
				 
			
				
					
						
							
							
								Diego Biurrun 
							
						 
					 
					
						
						
						
						
							
						
						
							5b21bdabe4 
							
						 
					 
					
						
						
							
							Add FFMPEG_ prefix to all multiple inclusion guards.  
						
						... 
						
						
						
						Originally committed as revision 10765 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2007-10-17 09:37:46 +00:00 
						 
				 
			
				
					
						
							
							
								Måns Rullgård 
							
						 
					 
					
						
						
						
						
							
						
						
							99545457bf 
							
						 
					 
					
						
						
							
							include all prerequisites in header files  
						
						... 
						
						
						
						Originally committed as revision 9344 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2007-06-16 22:59:13 +00:00 
						 
				 
			
				
					
						
							
							
								Reimar Döffinger 
							
						 
					 
					
						
						
						
						
							
						
						
							c9ec7564f0 
							
						 
					 
					
						
						
							
							Move idct block array variable onto rtjpeg_decode_frame_yuv420 stack since  
						
						... 
						
						
						
						it is only used there and is only 128 byte large.
Also make it aligned to fix playback with altivec.
Originally committed as revision 6902 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2006-11-05 16:18:37 +00:00 
						 
				 
			
				
					
						
							
							
								Diego Biurrun 
							
						 
					 
					
						
						
						
						
							
						
						
							b78e7197a8 
							
						 
					 
					
						
						
							
							Change license headers to say 'FFmpeg' instead of 'this program/this library'  
						
						... 
						
						
						
						and fix GPL/LGPL version mismatches.
Originally committed as revision 6577 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2006-10-07 15:30:46 +00:00 
						 
				 
			
				
					
						
							
							
								Diego Biurrun 
							
						 
					 
					
						
						
						
						
							
						
						
							04d7f60143 
							
						 
					 
					
						
						
							
							Add official LGPL license headers to the files that were missing them.  
						
						... 
						
						
						
						Originally committed as revision 6219 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2006-09-10 14:02:42 +00:00 
						 
				 
			
				
					
						
							
							
								Reimar Döffinger 
							
						 
					 
					
						
						
						
						
							
						
						
							dfca23e361 
							
						 
					 
					
						
						
							
							NuppelVideo/MythTVVideo support, including rtjpeg decoder  
						
						... 
						
						
						
						Originally committed as revision 5232 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2006-03-27 22:22:50 +00:00